ob-metaflow-extensions 1.1.92__tar.gz → 1.1.93__tar.gz

{ob-metaflow-extensions-1.1.92 → ob-metaflow-extensions-1.1.93}/PKG-INFO

@@ -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 → ob-metaflow-extensions-1.1.93}/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 → ob-metaflow-extensions-1.1.93}/ob_metaflow_extensions.egg-info/PKG-INFO

@@ -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 → ob-metaflow-extensions-1.1.93}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 from pathlib import Path
 
 
-version = "1.1.92"
+version = "1.1.93"
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()