ob-metaflow-extensions 1.4.18__tar.gz → 1.4.19__tar.gz

{ob_metaflow_extensions-1.4.18 → ob_metaflow_extensions-1.4.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob_metaflow_extensions
-Version: 1.4.18
+Version: 1.4.19
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob_metaflow_extensions-1.4.18 → ob_metaflow_extensions-1.4.19}/metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py

@@ -254,7 +254,8 @@ class DockerEnvironment(MetaflowEnvironment):
                 (d for d in step.decorators if _is_env_deco(d)),
                 None,
             )
-            python = next(
+            python = None
+            conda_set_python = next(
                 (
                     d.attributes["python"]
                     for d in step.decorators
@@ -262,17 +263,25 @@ class DockerEnvironment(MetaflowEnvironment):
                 ),
                 None,
             )
-            pypi_deco = next(
-                (d for d in step.decorators if isinstance(d, PyPIStepDecorator)), None
+            pypi_set_python = next(
+                (
+                    d.attributes["python"]
+                    for d in step.decorators
+                    if isinstance(d, PyPIStepDecorator)
+                ),
+                None,
             )
-            # if pypi decorator is set and user has specified a python version, we must create a new environment.
-            # otherwise rely on the base environment
-            if pypi_deco is not None:
-                python = (
-                    pypi_deco.attributes["python"]
-                    if pypi_deco.is_attribute_user_defined("python")
-                    else None
-                )
+            # Since the introduction of custom decorators and new packaging support in Metaflow
+            # @pypi/@pypi_base etc can be set at runtime and can also be overriden at runtime.
+            # So at time of execution here, we can assume the python version set in the decorator land
+            # is the one that has been finally resolved. So we just coalesce the conda_set_python and pypi_set_python.
+            def coalesce(*args):
+                for arg in args:
+                    if arg is not None:
+                        return arg
+                return None
+
+            python = coalesce(conda_set_python, pypi_set_python)
 
             packages = get_pinned_conda_libs(python, self.datastore_type)
             packages.update(dependencies.attributes["packages"] if dependencies else {})

{ob_metaflow_extensions-1.4.18 → ob_metaflow_extensions-1.4.19}/ob_metaflow_extensions.egg-info/PKG-INFO

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

{ob_metaflow_extensions-1.4.18 → ob_metaflow_extensions-1.4.19}/setup.py

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