metaflow-netflixext 1.3.4.dev4__tar.gz → 1.3.4.dev6__tar.gz

{metaflow_netflixext-1.3.4.dev4/metaflow_netflixext.egg-info → metaflow_netflixext-1.3.4.dev6}/PKG-INFO

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

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/metaflow_extensions/netflix_ext/plugins/conda/conda_environment.py

@@ -202,7 +202,7 @@ class CondaEnvironment(MetaflowEnvironment):
                 "echo 'Bootstrapping environment ...'",
                 'python -m %s.remote_bootstrap "%s" "%s" %s %s %s'
                 % (
-                    "metaflow_extensions.nflx.plugins.conda",
+                    "metaflow_extensions.netflix_ext.plugins.conda",
                     self._flow.name,
                     step_name,
                     arg1,

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/metaflow_extensions/netflix_ext/plugins/conda/pypi_package_builder.py

@@ -18,7 +18,7 @@ from typing import (
 
 if TYPE_CHECKING:
     import metaflow.datastore.datastore_storage
-    import metaflow_extensions.nflx.plugins.conda.conda
+    import metaflow_extensions.netflix_ext.plugins.conda.conda
 
 from metaflow.debug import debug
 
@@ -62,7 +62,7 @@ class PackageToBuild:
 
 
 def build_pypi_packages(
-    conda: "metaflow_extensions.nflx.plugins.conda.conda.Conda",
+    conda: "metaflow_extensions.netflix_ext.plugins.conda.conda.Conda",
     storage: "metaflow.datastore.datastore_storage.DataStoreStorage",
     python_version: str,
     to_build_pkg_info: Dict[str, PackageToBuild],
@@ -343,7 +343,7 @@ def build_pypi_packages(
 
 
 def _build_with_pip(
-    conda: "metaflow_extensions.nflx.plugins.conda.conda.Conda",
+    conda: "metaflow_extensions.netflix_ext.plugins.conda.conda.Conda",
     binary: str,
     dest_path: str,
     key: str,

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/metaflow_extensions/netflix_ext/plugins/conda/resolvers/__init__.py

@@ -5,8 +5,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Type
 
 if TYPE_CHECKING:
-    import metaflow_extensions.nflx.plugins.conda.conda
-    import metaflow_extensions.nflx.plugins.conda.env_descr
+    import metaflow_extensions.netflix_ext.plugins.conda.conda
+    import metaflow_extensions.netflix_ext.plugins.conda.env_descr
 
 
 from ..utils import CondaException
@@ -57,28 +57,29 @@ class Resolver:
             )
         return resolver
 
-    def __init__(self, conda: "metaflow_extensions.nflx.plugins.conda.conda.Conda"):
+    def __init__(self, conda: "metaflow_extensions.netflix_ext.plugins.conda.conda.Conda"):
         self._conda = conda
 
     def resolve(
         self,
-        env_type: "metaflow_extensions.nflx.plugins.conda.env_descr.EnvType",
+        env_type: "metaflow_extensions.netflix_ext.plugins.conda.env_descr.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["metaflow_extensions.nflx.plugins.conda.env_descr.ResolvedEnvironment"]
+            List["metaflow_extensions.netflix_ext.plugins.conda.env_descr.ResolvedEnvironment"]
         ] = None,
         base_env: Optional[
-            "metaflow_extensions.nflx.plugins.conda.env_descr.ResolvedEnvironment"
+            "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.nflx.plugins.conda.env_descr.ResolvedEnvironment",
+        "metaflow_extensions.netflix_ext.plugins.conda.env_descr.ResolvedEnvironment",
         Optional[
-            List["metaflow_extensions.nflx.plugins.conda.env_descr.ResolvedEnvironment"]
+            List["metaflow_extensions.netflix_ext.plugins.conda.env_descr.ResolvedEnvironment"]
         ],
     ]:
         """

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/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.dev4 → metaflow_netflixext-1.3.4.dev6}/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.dev4 → metaflow_netflixext-1.3.4.dev6}/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.dev4 → metaflow_netflixext-1.3.4.dev6}/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

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/metaflow_extensions/netflix_ext/plugins/conda/utils.py

@@ -59,7 +59,7 @@ from requests import PreparedRequest, Response, Session
 from requests.auth import AuthBase, HTTPBasicAuth
 
 if TYPE_CHECKING:
-    import metaflow_extensions.nflx.plugins.conda.env_descr
+    import metaflow_extensions.netflix_ext.plugins.conda.env_descr
     from metaflow_extensions.netflix_ext.plugins.conda.env_descr import (
         PackageSpecification,
         ResolvedEnvironment,
@@ -567,7 +567,7 @@ def is_alias_mutable(alias_type: AliasType, resolved_alias: str) -> bool:
 
 def dict_to_tstr(
     deps: Dict[str, List[str]],
-) -> List["metaflow_extensions.nflx.plugins.conda.env_descr.TStr"]:
+) -> List["metaflow_extensions.netflix_ext.plugins.conda.env_descr.TStr"]:
     from .env_descr import TStr  # Avoid circular import
 
     result = []  # type: List[TStr]
@@ -577,7 +577,7 @@ def dict_to_tstr(
 
 
 def tstr_to_dict(
-    deps: List["metaflow_extensions.nflx.plugins.conda.env_descr.TStr"],
+    deps: List["metaflow_extensions.netflix_ext.plugins.conda.env_descr.TStr"],
 ) -> Dict[str, List[str]]:
     result = {}  # type: Dict[str, List[str]]
     for dep in deps:

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/metaflow_extensions/netflix_ext/plugins/coverage/generate_coveragerc.py

@@ -2,7 +2,7 @@ import configparser
 import coverage
 import re
 import os
-from metaflow_extensions.netflix_ext.plugins.coverage.setup_coverage import COVERAGE_RCFILE
+from metaflow_extensions.netflix_ext.plugins.coverage.setup_coverage import get_coverage_rcfile
 
 
 def get_tmp_dirs(pattern, coverage_rcfile, data_file=".coverage"):
@@ -91,6 +91,6 @@ def save_updated_coveragerc(config, coverage_rcfile, output_file):
 
 
 if __name__ == "__main__":
-    cov = coverage.Coverage(data_file=".coverage", config_file=COVERAGE_RCFILE)
-    remap_tmp_dirs(cov, COVERAGE_RCFILE, ".coverage")
-    save_updated_coveragerc(cov.config, COVERAGE_RCFILE, ".coveragerc")
+    cov = coverage.Coverage(data_file=".coverage", config_file=get_coverage_rcfile())
+    remap_tmp_dirs(cov, get_coverage_rcfile(), ".coverage")
+    save_updated_coveragerc(cov.config, get_coverage_rcfile(), ".coveragerc")

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/metaflow_extensions/netflix_ext/plugins/coverage/setup_coverage.py

@@ -9,10 +9,20 @@ if TYPE_CHECKING:
     import sh
 
 MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
-COVERAGE_RCFILE = os.path.join(MODULE_DIR, "coveragerc.py")
 SITECUSTOMIZE_FILE = os.path.join(MODULE_DIR, "sitecustomize.py")
 
 
+def get_coverage_rcfile() -> str:
+    """Return the coveragerc path, allowing extensions to override via env var."""
+    return os.environ.get("METAFLOW_COVERAGE_RCFILE_PATH") or os.path.join(
+        MODULE_DIR, "coveragerc.py"
+    )
+
+
+# Backwards-compatible alias — resolved at call time via get_coverage_rcfile()
+COVERAGE_RCFILE = os.path.join(MODULE_DIR, "coveragerc.py")
+
+
 def get_local_coverage_dir():
     METAFLOW_COVERAGE_S3_PATH = os.environ.get("METAFLOW_COVERAGE_S3_PATH")
     assert METAFLOW_COVERAGE_S3_PATH, "METAFLOW_COVERAGE_S3_PATH is not set"
@@ -44,7 +54,7 @@ def setup_sitecustomize(python_binary: str):
     # so that when the env is saved and restored we will have both.
     coverage_rcfile = os.path.join(site_packages_dir, ".coveragerc")
     if not os.path.exists(coverage_rcfile):
-        shutil.copy(COVERAGE_RCFILE, coverage_rcfile)
+        shutil.copy(get_coverage_rcfile(), coverage_rcfile)
 
     # We harden out the environment variables as the fallback so that it will work with
     # subprocesses that are launched without inheriting the environment.

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6}/metaflow_extensions/netflix_ext/plugins/coverage/upload_coverage_files.py

@@ -7,7 +7,7 @@ import shutil
 import subprocess
 import uuid
 
-from .setup_coverage import get_local_coverage_dir, COVERAGE_RCFILE
+from .setup_coverage import get_local_coverage_dir, get_coverage_rcfile
 
 
 def hash_file(file_path: str) -> str:
@@ -45,7 +45,7 @@ def combine_coverage_files(local_dir):
     if not files:
         return
     cov = coverage.Coverage(
-        data_file=combined_coverage_file, config_file=COVERAGE_RCFILE
+        data_file=combined_coverage_file, config_file=get_coverage_rcfile()
     )
     try:
         cov.combine(data_paths=files, keep=True)

{metaflow_netflixext-1.3.4.dev4 → metaflow_netflixext-1.3.4.dev6/metaflow_netflixext.egg-info}/PKG-INFO

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