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

nmk_python/_buildenv/template.py

@@ -67,35 +67,23 @@ class NmkPythonProjectTemplate(NmkBaseProjectTemplate):
 
     def handle_dependencies(self, packages: list[str]) -> dict[str, NmkConfigType]:
         # Iterate on packages
-        config_items: dict[str, NmkConfigType] = {}
-        simple_refs: list[str] = []
-        file_refs: list[str] = []
+        other_refs: list[str] = []
         dep_refs: list[str] = []
+
+        # Pre-filter non-dev dependencies
         for package in packages:
             # Check for dependency groups (no group means it's a regular dependency, otherwise it's a dev dependency)
             if ":" not in package:
                 dep_refs.append(package)
-            # Dev dependencies
             else:
-                package = package.split(":")[-1]  # Ignore dependency groups, if any (e.g. `dev:package` -> `package`)
-                if "." in package:
-                    package_path = Path(package)
-                    if package_path.is_absolute() and package_path.is_file():
-                        file_refs.append(package)
-                    elif (Path.cwd() / package).is_file():
-                        file_refs.append(f"${{PROJECTDIR}}/{package}")
-                    else:
-                        simple_refs.append(package)
-                else:
-                    simple_refs.append(package)
+                other_refs.append(package)
+
+        # Delegate to normal processing
+        config_items: dict[str, NmkConfigType] = super().handle_dependencies(other_refs)
 
         # Build settings
-        if dep_refs:
+        if dep_refs:  # pragma: no branch
             config_items["pythonPackageRequirements"] = dep_refs
-        if simple_refs:
-            config_items["venvPkgDeps"] = simple_refs
-        if file_refs:
-            config_items["venvArchiveDeps"] = file_refs
 
         return config_items
 

nmk_python/backends/uv_build_backend.py

@@ -39,11 +39,6 @@ class UvBuildBackend(PythonBuildBackend):
         # Name for wheel sub-directory
         wheel_sub_dir = "wheel_dist"
 
-        # Check for (experimental) uv-build backend
-        if self._model.config["pythonUseUvBuildBackend"].value:
-            # Prepare project version (without updating the venv)
-            self._env_backend.subprocess(["version", "--active", "--no-sync", wheel_version], cwd=build_dir)
-
         # Delegate to uv
         build_args = ["build", "--wheel", "--out-dir", wheel_sub_dir]
         self._env_backend.subprocess(build_args, cwd=build_dir)

nmk_python/build.py

@@ -4,6 +4,7 @@ Python package build module
 
 import importlib.metadata
 import json
+import os
 import shutil
 from fnmatch import fnmatch
 from itertools import product
@@ -17,6 +18,7 @@ from nmk.model.model import NmkModel
 from nmk.model.resolver import NmkDictConfigResolver, NmkListConfigResolver, NmkStrConfigResolver
 from nmk.utils import is_windows
 from packaging.requirements import Requirement
+from packaging.version import Version
 from tomlkit import loads
 from tomlkit.toml_file import TOMLFile
 
@@ -67,7 +69,7 @@ class PackageBuilder(NmkTaskBuilder):
         project_root = project_path.parent
         for source_dir in map(Path, source_dirs):
             shutil.copytree(source_dir, build_path / source_dir.relative_to(project_root))
-        for candidate in filter(lambda p: p.is_file(), map(Path, [project_path, version_file, project_root / "README.md", project_root / "LICENSE"])):
+        for candidate in filter(lambda p: p.is_file(), map(Path, [project_path, project_root / "README.md", project_root / "LICENSE"])):
             dest = build_path / candidate.relative_to(project_root)
             dest.parent.mkdir(parents=True, exist_ok=True)
             shutil.copyfile(candidate, dest)
@@ -266,12 +268,14 @@ class DepsMetadataBuilder(NmkTaskBuilder):
     Generate python dependencies metadata file
     """
 
-    def build(self, root_name: str, local_deps: list[str]):  # pyright: ignore[reportIncompatibleMethodOverride]
+    def build(self, root_name: str, local_deps: list[str], constraints: list[str], fail_on_error: bool):  # pyright: ignore[reportIncompatibleMethodOverride]
         """
         Generate python dependencies metadata file
 
         :param root_name: name of the root package
         :param local_deps: list of workspace local dependencies patterns
+        :param constraints: list of package constraints (may contain comments) to be checked against found dependencies
+        :param fail_on_error: if there are mismatches between actual dependencies and constraints, and if true, and the build in error
         """
 
         # Normalization implementation
@@ -325,6 +329,40 @@ class DepsMetadataBuilder(NmkTaskBuilder):
             )
         )
 
+        # Check constraints vs external deps if any
+        filtered_constraints = [line for line in constraints if not line.startswith("# ")]
+        if filtered_constraints and output_data[_EXTERNAL_DEPS_KEY]:  # pragma: no branch
+            try:
+                self._check_constraints(filtered_constraints, output_data[_EXTERNAL_DEPS_KEY], fail_on_error)
+            except Exception as e:
+                # Touch output file to force task to be retriggered on next build
+                input_state = self.main_input.stat()
+                os.utime(self.main_output, (input_state.st_atime, input_state.st_mtime))
+                raise e
+
+    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]}
+
+        # Count errors
+        errors = 0
+
+        # 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}")
+                errors += 1
+                continue
+
+            # Check mismatch version
+            req, req_line = all_reqs[name]
+            if Version(version) not in req.specifier:
+                self.logger.warning(f"Found dependency with constraint mismatch: {name} ({version}) vs '{req_line}'")
+                errors += 1
+
+        assert (errors == 0) or not fail_on_error, f"{errors} error(s) found while checking dependencies vs constraints"
+
 
 class PythonIgnoredLockfileResolver(NmkListConfigResolver):
     """
@@ -338,8 +376,8 @@ class PythonIgnoredLockfileResolver(NmkListConfigResolver):
 
         # Ignore uv.lock file if using uv env backend and project is not locked
         if not self.model.env_backend.is_locked and self.model.env_backend.name == "uv":
-            return ["uv.lock"]  # pragma: no cover
-        return []
+            return ["uv.lock"]
+        return []  # pragma: no cover
 
 
 class PythonMergedConstraintsResolver(NmkListConfigResolver):

nmk_python/build.yml

@@ -78,7 +78,7 @@ config:
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}
-        packages_dir: ${r!pythonArtifacts}
+        packages_dir: ${r!pythonBuildDir}/wheel_dist
 
   # Wheel install arguments (for pip backend)
   pythonWheelPipInstallArgs:
@@ -121,6 +121,9 @@ config:
       constraints: ${pythonConstraints}
       constraints_files: ${pythonConstraintsFiles}
 
+  # Constraints check mode (strict or not)
+  pythonConstraintsStrictCheck: false
+
 tasks:
   # Python editable install
   py.editable:
@@ -154,6 +157,8 @@ tasks:
     params:
       root_name: ${pythonPackage}
       local_deps: ${pythonLocalDepsPatterns}
+      constraints: ${pythonMergedConstraints}
+      fail_on_error: ${pythonConstraintsStrictCheck}
 
   # Python wheel build
   py.build:

nmk_python/version.py

@@ -59,7 +59,7 @@ class PythonSupportedVersionsResolver(NmkListConfigResolver):
         assert len(min_split) == len(max_split), prefix + "not the same segments count"
         assert len(min_split) == 2, prefix + "can only deal with X.Y versions (2 segments expected)"
         assert min_split[0] == max_split[0], prefix + "can't deal with different major versions"
-        assert max_split[1] > min_split[1], prefix + "max isn't greater than min"
+        assert max_split[1] >= min_split[1], prefix + "max isn't greater than min"
 
         # Also verifies current runtime is in range
         p_ver = platform.python_version()

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

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

{nmk_python-1.11.0.dist-info → nmk_python-1.12.1.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=kcixJP5-YgKBKJ-gVtHpvyI3WvjmVHgwEgL9e3OJBNU,14860
-nmk_python/build.yml,sha256=p_ziFqTxNqPn6hvLyHtutVJVVmlXqbkr7TbFo64_45w,6336
+nmk_python/build.py,sha256=V2CiDI-srmFriYR7XuKJWZPuuBAv7LYX8drMz06jmug,16828
+nmk_python/build.yml,sha256=nsHgL_2zrWKDV2bkiSMKZTtU_FKVCDXXRThajKylcsw,6527
 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
@@ -11,15 +11,15 @@ 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/version.py,sha256=w15Zk7_TgqEsVSFN7Ql71-5gO5yOXoIYRdI_QlvMjYI,2738
+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
-nmk_python/_buildenv/template.py,sha256=avDeQuMSYHTiTwAgLbrpTPZ6bSaEqjCZDkcpzFxNt88,4568
+nmk_python/_buildenv/template.py,sha256=-yugMcl93gcKfPKrLYTmIMOEIoNvVWGVnqkY3-z4JF8,3922
 nmk_python/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nmk_python/backends/build_backend.py,sha256=WO0wZaxGdPna4K2yK7pNLtZX3cKf6atLLa00931N43Y,1400
 nmk_python/backends/factory.py,sha256=NMYByORffwSSIjeNMLkOnwh6x1xhJQVhoV-0rSooq6Q,953
 nmk_python/backends/pip_build_backend.py,sha256=4MGYghBeMjZhUlKTwE0svSHArYwOAaK1I6_gmeNnwaI,1698
-nmk_python/backends/uv_build_backend.py,sha256=cIQwKVsYWHlVQCmHWjjoC-3aRmWiHK55VSGexQbn_vw,1963
+nmk_python/backends/uv_build_backend.py,sha256=gpM1L5FuJ5CF-OkRORnAbZHACPNhjkoO1sKZtdAhpf0,1671
 nmk_python/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nmk_python/templates/build.toml.jinja,sha256=D-RYPUGiqkYUKyQt_dP_tNFU-83eer7bnv57k4pMmIw,2137
 nmk_python/templates/pytest.toml.jinja,sha256=zQ3SRWnF23Omxm7zInE54j0l3OyjXSOn5pQ5Pak8Boo,641
@@ -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.11.0.dist-info/licenses/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
-nmk_python-1.11.0.dist-info/METADATA,sha256=U8SM11IYPXQVPE-ajBZtYmcV2yllVRn62A_4YifjWhw,3205
-nmk_python-1.11.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-nmk_python-1.11.0.dist-info/entry_points.txt,sha256=QLXIIXl6wODHDnVkh7KuiLv_XzfFtNfdWwpxyB675ak,88
-nmk_python-1.11.0.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
-nmk_python-1.11.0.dist-info/RECORD,,
+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.11.0.dist-info → nmk_python-1.12.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (83.0.0)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any