nmk-python 1.12.1__py3-none-any.whl → 1.13.0__py3-none-any.whl

nmk_python/build.py

@@ -166,7 +166,7 @@ class Uninstaller(NmkTaskBuilder):
     Uninstall current project wheel from venv
     """
 
-    def build(self, name: str, local_deps: list[str] | None = None):  # pyright: ignore[reportIncompatibleMethodOverride]
+    def build(self, name: str, local_deps: list[str] | None = None, lock_files: list[str] | None = None):  # pyright: ignore[reportIncompatibleMethodOverride]
         """
         Uninstall wheel from venv
 
@@ -174,8 +174,17 @@ class Uninstaller(NmkTaskBuilder):
 
         :param name: wheel name to be uninstalled
         :param local_deps: list of workspace local dependencies patterns, used to find additional wheels to uninstall
+        :param lock_files: list of paths to lock files to be cleaned
         """
 
+        # Clean lock files, if required and present
+        project_root = self.model.env_backend.project_path
+        for lock_file_path in filter(
+            lambda p: p.is_file(), map(lambda p: p if p.is_absolute() else project_root / p, map(Path, lock_files if lock_files else []))
+        ):
+            self.logger.debug(f"Removing lock file: {lock_file_path}")
+            lock_file_path.unlink()
+
         # Find local deps to uninstall, from provided packages
         wheel_names = set([name])
         eb = cast(EnvBackend, self.model.env_backend)  # type: ignore
@@ -263,6 +272,11 @@ _INTERNAL_DEPS_KEY = "internal"
 _EXTERNAL_DEPS_KEY = "external"
 
 
+# Normalization implementation
+def _normalize(name: str) -> str:
+    return name.lower().replace("_", "-")
+
+
 class DepsMetadataBuilder(NmkTaskBuilder):
     """
     Generate python dependencies metadata file
@@ -278,21 +292,20 @@ class DepsMetadataBuilder(NmkTaskBuilder):
         :param fail_on_error: if there are mismatches between actual dependencies and constraints, and if true, and the build in error
         """
 
-        # Normalization implementation
-        def normalize(name: str) -> str:
-            return name.lower().replace("_", "-")
-
         # Prepare distributions map
-        distributions = {normalize(d.name): d for d in importlib.metadata.distributions() if d.name}
-        normalized_root_name = normalize(root_name)
+        distributions = {_normalize(d.name): d for d in importlib.metadata.distributions() if d.name}
+        normalized_root_name = _normalize(root_name)
         assert normalized_root_name in distributions, f"Root package '{normalized_root_name}' not found in installed distributions"
         output_data: dict[str, dict[str, str]] = {_INTERNAL_DEPS_KEY: {}, _EXTERNAL_DEPS_KEY: {}}
+        visited: set[tuple[str, frozenset[str]]] = set()
 
         # Visitor implementation
-        def visit(name: str):
-            # Already visited or unknown?
-            if (name in output_data[_INTERNAL_DEPS_KEY]) or (name in output_data[_EXTERNAL_DEPS_KEY]) or (name not in distributions):
+        def visit(name: str, extras: frozenset[str] = frozenset()):
+            # Already visited with the same extras or unknown?
+            visit_key = (name, extras)
+            if visit_key in visited or name not in distributions:
                 return
+            visited.add(visit_key)
 
             # Check for internal/external dependency
             if name != root_name:
@@ -309,11 +322,15 @@ class DepsMetadataBuilder(NmkTaskBuilder):
                 req = Requirement(dep)
 
                 # Check marker, if any (but not for root package dependencies, which are always included)
-                if (name != root_name) and (req.marker is not None) and (not req.marker.evaluate()):
+                if (
+                    (name != root_name)
+                    and (req.marker is not None)
+                    and (not any(req.marker.evaluate(environment={"extra": extra}) for extra in extras) if extras else not req.marker.evaluate())
+                ):
                     continue
 
                 # Visit dependency if installed
-                visit(normalize(req.name))
+                visit(_normalize(req.name), frozenset(req.extras))
 
         # Visit from root
         visit(root_name)
@@ -342,7 +359,7 @@ class DepsMetadataBuilder(NmkTaskBuilder):
 
     def _check_constraints(self, constraints: list[str], deps: dict[str, str], fail_on_error: bool):
         # Build all requirements
-        all_reqs = {r[0].name: r for r in [(Requirement(line), line) for line in constraints]}
+        all_reqs = {_normalize(r[0].name): r for r in [(Requirement(line), line) for line in constraints]}
 
         # Count errors
         errors = 0
@@ -350,13 +367,13 @@ class DepsMetadataBuilder(NmkTaskBuilder):
         # Browse dependencies
         for name, version in deps.items():
             # Check missing constraint on actual dependency
-            if name not in all_reqs:
-                self.logger.warning(f"Found dependency with missing constraint:  {name}")
+            if _normalize(name) not in all_reqs:
+                self.logger.warning(f"Found dependency with missing constraint: {name}")
                 errors += 1
                 continue
 
             # Check mismatch version
-            req, req_line = all_reqs[name]
+            req, req_line = all_reqs[_normalize(name)]
             if Version(version) not in req.specifier:
                 self.logger.warning(f"Found dependency with constraint mismatch: {name} ({version}) vs '{req_line}'")
                 errors += 1

nmk_python/build.yml

@@ -212,4 +212,5 @@ tasks:
     params:
       name: ${pythonPackage}
       local_deps: ${pythonLocalDepsPatterns}
+      lock_files: ${pythonIgnoredLockfile}
     if: ${pythonSrcFiles} # Only if python source files are found

nmk_python/tests.yml

@@ -28,7 +28,7 @@ config:
   # Additional github build step: upload coverage report on codecov
   githubBuildSteps:
     - name: Upload coverage information
-      uses: codecov/codecov-action@v4.3.1
+      uses: codecov/codecov-action@v7.1.1
       with:
         files: ${r!pythonCoverageXmlReport}
       env:

{nmk_python-1.12.1.dist-info → nmk_python-1.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nmk-python
-Version: 1.12.1
+Version: 1.13.0
 Summary: Python plugin for nmk build system
 Author: The dynod project
 Maintainer: The dynod project

{nmk_python-1.12.1.dist-info → nmk_python-1.13.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 nmk_python/__init__.py,sha256=EouCWXbAeObby1vOCx0Vx_WaGC2fEEFDMCen3JZt4TU,446
 nmk_python/badges.yml,sha256=LzElZecCXKxdF-oPkvIwfnbQlOcAM_zUj6MelClmAug,749
-nmk_python/build.py,sha256=V2CiDI-srmFriYR7XuKJWZPuuBAv7LYX8drMz06jmug,16828
-nmk_python/build.yml,sha256=nsHgL_2zrWKDV2bkiSMKZTtU_FKVCDXXRThajKylcsw,6527
+nmk_python/build.py,sha256=5acJJ1EQGEqvcOhBqA2qtTzGaZBviAliEEvjIj8ybu8,17675
+nmk_python/build.yml,sha256=x1jPasHa0h9Bgqmc-xnr-IBmjLBpNLdE3aEZXYMgsZA,6570
 nmk_python/doc.yml,sha256=12amAlYylH7JAHaqBIOoEZ_LrXY_bPNKuHrrwUkIj8w,932
 nmk_python/files.py,sha256=K6Y-XKXuf8jh4x333Qgj6G1MyB-BgZ5Kd2-XCZhsfR4,2000
 nmk_python/files.yml,sha256=jlp87gW9rTASUnsy7id7VWanaMUMN_py82bMa2adniM,813
@@ -10,7 +10,7 @@ nmk_python/project.yml,sha256=wBnB6KOglRvIpw1UHuXTYmuE_2BYGBzGWwIEbA5NDv8,985
 nmk_python/ruff.py,sha256=TBmn5nFflcFRvjj36JtJGJ-GYHOK6XfhK9Jp-2dO5_E,1557
 nmk_python/ruff.yml,sha256=L3vSTLGI3ZP46D64VxenhF9Gz3lo5-J9cRwgKBrVl48,2732
 nmk_python/tests.py,sha256=p2dl41eZW8cpUMOa2DXi3CN3iVQEnElC88Ke89PRyy8,1597
-nmk_python/tests.yml,sha256=by_Ml1JXjgt1-J96AMp-6gwhISVFVylRZowUvaMkfpk,1636
+nmk_python/tests.yml,sha256=WwQPgVKztrWAn-JXdMdhYuu0DrnQSXgkwWNn8Nn7X0o,1636
 nmk_python/version.py,sha256=ivSff_1l-u-rSACF91s58zX_EUzl0ate_JcX_l7dSQk,2739
 nmk_python/version.yml,sha256=D_rUnEzjEtCmCgUhfaDPSsANaRkcDW7aZgPX6GZOUIk,1159
 nmk_python/_buildenv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,9 +30,9 @@ nmk_python/templates/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 nmk_python/templates/src/__init__.py.jinja,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nmk_python/templates/src/sample.py.jinja,sha256=OOTps7EjviwYFCIb5GpMHcidxhBY5NLQVlcFLqxuxNU,227
 nmk_python/templates/src/test_sample.py.jinja,sha256=u-ShBoKDF3se9KvgQ1SzO4NwymjqNowwURF4Q1oR3wo,221
-nmk_python-1.12.1.dist-info/licenses/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
-nmk_python-1.12.1.dist-info/METADATA,sha256=kODo2u7iSzu4SF_YRJYprLfxncTzvvM5qZGLIhRqaZ0,3205
-nmk_python-1.12.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-nmk_python-1.12.1.dist-info/entry_points.txt,sha256=QLXIIXl6wODHDnVkh7KuiLv_XzfFtNfdWwpxyB675ak,88
-nmk_python-1.12.1.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
-nmk_python-1.12.1.dist-info/RECORD,,
+nmk_python-1.13.0.dist-info/licenses/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
+nmk_python-1.13.0.dist-info/METADATA,sha256=hzKrXJ3O6HtO25C6qTUYD1I_P32D8VzOlZhRcwfYgTw,3205
+nmk_python-1.13.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+nmk_python-1.13.0.dist-info/entry_points.txt,sha256=QLXIIXl6wODHDnVkh7KuiLv_XzfFtNfdWwpxyB675ak,88
+nmk_python-1.13.0.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
+nmk_python-1.13.0.dist-info/RECORD,,