ob-metaflow-extensions 1.1.92__py2.py3-none-any.whl → 1.1.93__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py

@@ -123,6 +123,14 @@ class DockerEnvironment(MetaflowEnvironment):
         # Attach environment decorator as needed. This is done on a step-by-step basis
         # as we require a conda decorator for fallback steps, but prefer pypi for the baked ones.
         for step in self.flow:
+            # Mixing @pypi/@conda in a single step is not supported yet.
+            # We validate this before attaching any new ones as the OSS Conda environment requires an implicit conda decorator for pypi environments which would fail the validation.
+            if sum(1 for deco in step.decorators if _is_env_deco(deco)) > 1:
+                raise MetaflowException(
+                    "Mixing and matching PyPI packages and Conda packages within a\n"
+                    "step is not yet supported. Use one of @pypi or @conda only for the *%s* step."
+                    % step.name
+                )
             if step.name in self.skipped_steps:
                 # Conda fallback requires a conda decorator as the default for a step
                 decorators._attach_decorators_to_step(step, ["conda"])
@@ -144,14 +152,6 @@ class DockerEnvironment(MetaflowEnvironment):
                         echo,
                     )
 
-            # Mixing @pypi/@conda in a single step is not supported yet
-            if sum(1 for deco in step.decorators if _is_env_deco(deco)) > 1:
-                raise MetaflowException(
-                    "Mixing and matching PyPI packages and Conda packages within a\n"
-                    "step is not yet supported. Use one of @pypi or @conda only for the *%s* step."
-                    % step.name
-                )
-
         steps_to_bake = [
             step
             for step in self.flow

{ob_metaflow_extensions-1.1.92.dist-info → ob_metaflow_extensions-1.1.93.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.92
+Version: 1.1.93
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob_metaflow_extensions-1.1.92.dist-info → ob_metaflow_extensions-1.1.93.dist-info}/RECORD

@@ -5,7 +5,7 @@ metaflow_extensions/outerbounds/plugins/__init__.py,sha256=WwvFcN5kserbPwhrE4hXp
 metaflow_extensions/outerbounds/plugins/auth_server.py,sha256=1v2GBqoMBxp5E7Lejz139w-jxJtPnLDvvHXP0HhEIHI,2361
 metaflow_extensions/outerbounds/plugins/perimeters.py,sha256=QXh3SFP7GQbS-RAIxUOPbhPzQ7KDFVxZkTdKqFKgXjI,2697
 metaflow_extensions/outerbounds/plugins/fast_bakery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py,sha256=7PaCyOcEV71uHZ6mLdgbYSD-qzv_mC04JLlBwOLoQR4,13814
+metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py,sha256=jpEBbdRLq7826LqUKIHqo3cYei2CNeVAxggw6vFmYso,13996
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery.py,sha256=MAPRQsfqeEkL1LXqgwPrUJOzZ3kY3C00QjdDgQ7wdIg,5160
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery_cli.py,sha256=kqFyu2bJSnc9_9aYfBpz5xK6L6luWFZK_NMuh8f1eVk,1494
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery_decorator.py,sha256=EZDbyrfZ7fgcU-P9dMS_hpCxsdDeUE0K5VU3uNM4aW4,1506
@@ -33,7 +33,7 @@ metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py,
 metaflow_extensions/outerbounds/toplevel/plugins/azure/__init__.py,sha256=WUuhz2YQfI4fz7nIcipwwWq781eaoHEk7n4GAn1npDg,63
 metaflow_extensions/outerbounds/toplevel/plugins/gcp/__init__.py,sha256=BbZiaH3uILlEZ6ntBLKeNyqn3If8nIXZFq_Apd7Dhco,70
 metaflow_extensions/outerbounds/toplevel/plugins/kubernetes/__init__.py,sha256=5zG8gShSj8m7rgF4xgWBZFuY3GDP5n1T0ktjRpGJLHA,69
-ob_metaflow_extensions-1.1.92.dist-info/METADATA,sha256=ErKr4z77BaOS6alTco5zeVtZc2KqpSeezK9BscAoZio,520
-ob_metaflow_extensions-1.1.92.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.1.92.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.1.92.dist-info/RECORD,,
+ob_metaflow_extensions-1.1.93.dist-info/METADATA,sha256=yWB9qUR6LTg61tnxvkMqcdGw3SRZjcSnSIhn6J6u5aQ,520
+ob_metaflow_extensions-1.1.93.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.1.93.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.1.93.dist-info/RECORD,,