metaflow-netflixext 1.3.4.dev5__tar.gz → 1.3.4.dev7__tar.gz

{metaflow_netflixext-1.3.4.dev5/metaflow_netflixext.egg-info → metaflow_netflixext-1.3.4.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metaflow-netflixext
-Version: 1.3.4.dev5
+Version: 1.3.4.dev7
 Summary: Metaflow extensions from Netflix
 Author: Netflix Metaflow Developers
 Author-email: metaflow-dev@netflix.com

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/pypi_package_builder.py

@@ -354,6 +354,18 @@ def _build_with_pip(
     debug.conda_exec("%s: building from '%s' in '%s'" % (key, src, dest_path))
 
     addl_env = {"PATH": os.path.dirname(binary) + ":" + os.environ["PATH"]}
+
+    # Constrain setuptools<82 in pip's build isolation subprocesses.
+    # The top-level pip uses --isolated (ignores env vars), but the build
+    # isolation subprocess that installs build deps does NOT, so it honors
+    # PIP_CONSTRAINT. This prevents setuptools>=82 (which removed
+    # pkg_resources) from being installed in the build environment.
+    constraint_file = os.path.join(dest_path, "constraints.txt")
+    os.makedirs(dest_path, exist_ok=True)
+    with open(constraint_file, "w") as cf:
+        cf.write("setuptools<82\n")
+    addl_env["PIP_CONSTRAINT"] = constraint_file
+
     conda.call_binary(
         [
             "-m",

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/resolvers/__init__.py

@@ -75,6 +75,7 @@ class Resolver:
             "metaflow_extensions.netflix_ext.plugins.conda.env_descr.ResolvedEnvironment"
         ] = None,
         file_paths: Dict[str, List[str]] = {},
+        full_id_unique_keys: Optional[Dict[str, str]] = None,
     ) -> Tuple[
         "metaflow_extensions.netflix_ext.plugins.conda.env_descr.ResolvedEnvironment",
         Optional[

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/resolvers/builder_envs_resolver.py

@@ -24,6 +24,7 @@ class BuilderEnvsResolver(Resolver):
         builder_envs: Optional[List[ResolvedEnvironment]] = None,
         base_env: Optional[ResolvedEnvironment] = None,
         file_paths: Dict[str, List[str]] = {},
+        full_id_unique_keys: Optional[Dict[str, str]] = None,
     ) -> Tuple[ResolvedEnvironment, Optional[List[ResolvedEnvironment]]]:
         conda_only_sources = sources.get("conda", [])
         python_deps = [d for d in deps.get("conda", []) if d.startswith("python==")]

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/resolvers/conda_lock_resolver.py

@@ -64,6 +64,7 @@ class CondaLockResolver(Resolver):
         builder_envs: Optional[List[ResolvedEnvironment]] = None,
         base_env: Optional[ResolvedEnvironment] = None,
         file_paths: Dict[str, List[str]] = {},
+        full_id_unique_keys: Optional[Dict[str, str]] = None,
     ) -> Tuple[ResolvedEnvironment, Optional[List[ResolvedEnvironment]]]:
         outfile_name = None
         external_packages = {}

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/resolvers/micromamba_server_resolver.py

@@ -15,12 +15,15 @@ class CondaLockResolver(Resolver):
     def resolve(
         self,
         env_type: EnvType,
+        python_version_requested: str,
         deps: Dict[str, List[str]],
         sources: Dict[str, List[str]],
         extras: Dict[str, List[str]],
         architecture: str,
         builder_envs: Optional[List[ResolvedEnvironment]] = None,
         base_env: Optional[ResolvedEnvironment] = None,
+        file_paths: Dict[str, List[str]] = {},
+        full_id_unique_keys: Optional[Dict[str, str]] = None,
     ) -> Tuple[ResolvedEnvironment, Optional[List[ResolvedEnvironment]]]:
         raise NotImplementedError
 

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/resolvers/pip_resolver.py

@@ -144,6 +144,20 @@ class PipResolver(Resolver):
             ]
             args.extend(extra_args)
 
+            # Constrain setuptools<82 so that build isolation environments
+            # retain pkg_resources (removed in setuptools 82). Many third-party
+            # packages still use pkg_resources in their setup.py.
+            constraint_file = os.path.join(pypi_dir, "constraints.txt")
+            with open(constraint_file, "w") as cf:
+                cf.write("setuptools<82\n")
+            args.extend(["--constraint", constraint_file])
+            # Also set PIP_CONSTRAINT env var so the constraint propagates to
+            # pip's build isolation subprocesses (--constraint only applies to
+            # the top-level resolution, not to build dependency installation).
+            # The main pip command uses --isolated which ignores env vars, but
+            # build isolation subprocesses do not, so they will honor this.
+            addl_env["PIP_CONSTRAINT"] = constraint_file
+
             pypi_sources = sources.get("pypi", [])
             # The first source is always the index
             args.extend(["-i", pypi_sources[0]])

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/resolvers/pylock_toml_resolver.py

@@ -48,6 +48,7 @@ class PylockTomlResolver(Resolver):
         builder_envs: Optional[List[ResolvedEnvironment]] = None,
         base_env: Optional[ResolvedEnvironment] = None,
         file_paths: Dict[str, List[str]] = {},
+        full_id_unique_keys: Optional[Dict[str, str]] = None,
     ) -> Tuple[ResolvedEnvironment, Optional[List[ResolvedEnvironment]]]:
         # Checks on len(tom_path_list) >= 1 skiped due to get_resolver_cls()
         # only triggers this class's resolve() call when its len >= 1
@@ -115,6 +116,7 @@ class PylockTomlResolver(Resolver):
             architecture,
             supported_tags,
             filter_func,
+            full_id_unique_keys,
         )
 
         return (resolved_env, builder_envs)
@@ -219,6 +221,7 @@ class PylockTomlResolver(Resolver):
                 Dict[str, List[PackageSpecification]],
             ]
         ] = None,
+        full_id_unique_keys: Dict[str, str] = {},
     ) -> ResolvedEnvironment:
 
         packages_dict = PylockTomlResolver._pylock_toml_root_obj_to_packages(
@@ -243,6 +246,7 @@ class PylockTomlResolver(Resolver):
             sources,
             extras,
             architecture,
+            full_id_unique_keys=full_id_unique_keys,
         )
 
         return resolved_env
@@ -362,6 +366,7 @@ class PylockTomlResolver(Resolver):
         sources: Optional[Dict[str, List[str]]],
         extras: Optional[Dict[str, List[str]]],
         architecture: Optional[str] = None,
+        full_id_unique_keys: Optional[Dict[str, str]] = None,
     ):
         resolved_env = ResolvedEnvironment(
             deps,
@@ -370,6 +375,7 @@ class PylockTomlResolver(Resolver):
             architecture,
             all_packages=packages,
             env_type=env_type,
+            full_id_unique_keys=full_id_unique_keys,
         )
 
         return resolved_env

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7}/metaflow_extensions/netflix_ext/plugins/conda/utils.py

@@ -79,7 +79,7 @@ _BUILDER_ENVS_PACKAGES = (
     "pip",
     "wheel",
     "tomli",
-    "setuptools",
+    "setuptools<82",  # pkg_resources removed in setuptools 82; many packages still need it
     "uv<=0.7.8; python_version<'3.8'",
     "uv ; python_version>='3.8'",
 )

{metaflow_netflixext-1.3.4.dev5 → metaflow_netflixext-1.3.4.dev7/metaflow_netflixext.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metaflow-netflixext
-Version: 1.3.4.dev5
+Version: 1.3.4.dev7
 Summary: Metaflow extensions from Netflix
 Author: Netflix Metaflow Developers
 Author-email: metaflow-dev@netflix.com