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

nmk_python/build.py

@@ -11,12 +11,14 @@ from pathlib import Path
 from typing import cast
 
 from nmk.envbackend import EnvBackend
-from nmk.logs import NmkLogWrapper
+from nmk.logs import NmkLogger, NmkLogWrapper
 from nmk.model.builder import NmkTaskBuilder
 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 tomlkit import loads
+from tomlkit.toml_file import TOMLFile
 
 from nmk_python.backends.factory import BuildBackendFactory
 
@@ -70,6 +72,16 @@ class PackageBuilder(NmkTaskBuilder):
             dest.parent.mkdir(parents=True, exist_ok=True)
             shutil.copyfile(candidate, dest)
 
+        # Update project file scm root
+        build_project = build_path / project_path.name
+        with build_project.open() as f:
+            project_doc = loads(f.read())
+        scm_config = cast(dict[str, dict[str, str]], project_doc.get("tool")).get("setuptools_scm")  # type: ignore
+        assert scm_config is not None, "Can't find setuptools_scm config in project file"
+        scm_config["root"] = "/".join([".."] * len(build_path.relative_to(project_root).parts))
+        project_output = TOMLFile(build_project)
+        project_output.write(project_doc)
+
         # Handle extra resources
         for src, dst in extra_resources.items():
             src_path, dst_path = Path(src), Path(dst)
@@ -328,3 +340,38 @@ class PythonIgnoredLockfileResolver(NmkListConfigResolver):
         if not self.model.env_backend.is_locked and self.model.env_backend.name == "uv":
             return ["uv.lock"]  # pragma: no cover
         return []
+
+
+class PythonMergedConstraintsResolver(NmkListConfigResolver):
+    """
+    Python merged constraints resolver
+    """
+
+    def get_value(self, name: str, constraints: list[str], constraints_files: list[str]) -> list[str]:  # pyright: ignore[reportIncompatibleMethodOverride]
+        """
+        Return the merged list of constraints, coming from raw items and files
+        """
+
+        all_constraints: list[str] = []
+
+        # Step 1: read files
+        for constraints_file in map(Path, constraints_files):
+            # Check file existence
+            if not constraints_file.is_file():
+                NmkLogger.warning(f"Constraints file not found: {constraints_file}")
+                continue
+
+            def clean_line(line: str) -> str | None:
+                line = line.strip()
+                if not line.startswith("#"):
+                    # Remove end of line comments (keep full line ones)
+                    line = line.split("#", 1)[0].strip()
+                return line
+
+            # Get lines
+            all_constraints.extend(filter(None, map(clean_line, constraints_file.read_text().splitlines())))
+
+        # Step 2: add items
+        all_constraints.extend(constraints)
+
+        return all_constraints

nmk_python/build.yml

@@ -108,6 +108,19 @@ config:
   # Generated python dependencies metadata file
   pythonDepsMetadata: ${outputDir}/python_deps.json
 
+  # Python constraints, raw listed in nmk.yml files
+  pythonConstraints: []
+
+  # Python constraints files
+  pythonConstraintsFiles: []
+
+  # Merged constraints (from items + files)
+  pythonMergedConstraints:
+    __resolver__: nmk_python.build.PythonMergedConstraintsResolver
+    params:
+      constraints: ${pythonConstraints}
+      constraints_files: ${pythonConstraintsFiles}
+
 tasks:
   # Python editable install
   py.editable:

nmk_python/templates/build.toml.jinja

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["{% if pythonUseUvBuildBackend %}uv_build>=0.9.18,<0.10.0{% else %}setuptools{% endif %}"]
+requires = ["{% if pythonUseUvBuildBackend %}uv_build>=0.9.18,<0.10.0{% else %}setuptools", "setuptools_scm", "wheel{% endif %}"]
 build-backend = "{% if pythonUseUvBuildBackend %}uv_build{% else %}setuptools.build_meta{% endif %}"
 
 [project]
@@ -38,8 +38,10 @@ namespaces = false
 [tool.setuptools.package-data]
 "*" = ["*"]
 
-[tool.setuptools.dynamic.version]
-file = "{{ pythonVersionStamp }}"
+[tool.setuptools_scm]
+version_scheme = "{{ pythonVersionScheme }}"
+local_scheme = "{{ pythonVersionLocalScheme }}"
+fallback_version = "{{ pythonVersionFallback }}"
 
 {% endif %}[tool.distutils.bdist_wheel]
 plat-name = "{{ pythonPackagePlatform }}"
@@ -47,4 +49,11 @@ plat-name = "{{ pythonPackagePlatform }}"
 [tool.pyright]
 include = {{ pythonSrcFolders }}
 typeCheckingMode = "{{ pythonTypeCheckingMode }}"
-reportMissingTypeStubs = false
+reportMissingTypeStubs = false{% if not backendUseRequirements %}
+
+[tool.uv]
+cache-keys = [{ file = "pyproject.toml" }, { git = { commit = true, tags = true } }]
+{% if pythonMergedConstraints %}
+constraint-dependencies = {{ pythonMergedConstraints }}
+{% endif %}
+{% endif %}

nmk_python/version.py

@@ -3,13 +3,11 @@ Python version handling
 """
 
 import platform
-import re
+from typing import cast
 
 from nmk.model.builder import NmkTaskBuilder
 from nmk.model.resolver import NmkListConfigResolver, NmkStrConfigResolver
-
-# Git version pattern
-_GIT_VERSION_PATTERN = re.compile("([^-]+)(?:-([0-9]+))?(?:-(.+))?")
+from setuptools_scm import get_version
 
 
 class PythonVersionResolver(NmkStrConfigResolver):
@@ -17,26 +15,12 @@ class PythonVersionResolver(NmkStrConfigResolver):
     Python version resolver
     """
 
-    def get_value(self, name: str) -> str:
+    def get_value(self, name: str, root: str, version_scheme: str, local_scheme: str, fallback_version: str) -> str:  # type: ignore
         """
-        Turn the git version in the Python way
+        Delegates to setuptools_scm to get the version from git
         """
-        git_version = self.model.config["gitVersion"].value
-        m = _GIT_VERSION_PATTERN.match(git_version)
-        if m is not None:
-            # Build python version from git version segments
-            out = m.group(1)
-            if m.group(2) is not None:
-                # Add commits count
-                out += f".post{m.group(2)}"
-            if m.group(3) is not None:
-                # Add hash/dirty
-                out += f"+{m.group(3)}".replace("-", ".")
-            return out
-
-        # Probably a simpler version (without segments)
-        # Assume it is already compliant...
-        return git_version
+
+        return get_version(root=root, version_scheme=version_scheme, local_scheme=local_scheme, fallback_version=fallback_version)
 
 
 class PythonVersionRefresh(NmkTaskBuilder):
@@ -44,11 +28,11 @@ class PythonVersionRefresh(NmkTaskBuilder):
     Python version builder
     """
 
-    def build(self, version: str):
+    def build(self, version: str):  # type: ignore
         """
         Simple python version dump
         """
-        self.logger.info(self.task.emoji, self.task.description)
+        self.logger.info(self.task.emoji, self.task.description)  # type: ignore
         with self.main_output.open("w") as f:
             f.write(version)
 
@@ -69,7 +53,7 @@ class PythonSupportedVersionsResolver(NmkListConfigResolver):
             return list(map(int, v.split(".")))
 
         # Get min/max values, and verify consistency
-        min_ver, max_ver = self.model.config["pythonMinVersion"].value, self.model.config["pythonMaxVersion"].value
+        min_ver, max_ver = cast(tuple[str, str], (self.model.config["pythonMinVersion"].value, self.model.config["pythonMaxVersion"].value))
         min_split, max_split = _split_version(min_ver), _split_version(max_ver)
         prefix = "Inconsistency in python min/max supported versions: "
         assert len(min_split) == len(max_split), prefix + "not the same segments count"

nmk_python/version.yml

@@ -1,28 +1,38 @@
 config:
-    # The python version itself
-    pythonVersion:
-        __resolver__: nmk_python.version.PythonVersionResolver
+  # Automated version computing from git tags --  see https://setuptools-scm.readthedocs.io/en/latest/config/
+  pythonVersionScheme: no-guess-dev
+  pythonVersionLocalScheme: node-and-date
+  pythonVersionFallback: "0.0.0"
 
-    # Python version stamp file
-    pythonVersionStamp: ${outputDir}/.pythonversion
+  # The python version itself
+  pythonVersion:
+    __resolver__: nmk_python.version.PythonVersionResolver
+    params:
+      root: ${PROJECTDIR}
+      version_scheme: ${pythonVersionScheme}
+      local_scheme: ${pythonVersionLocalScheme}
+      fallback_version: ${pythonVersionFallback}
 
-    # Python supported versions range (min-max)
-    pythonMinVersion: "3.10"
-    pythonMaxVersion: "3.14"
-    pythonSupportedVersions:
-        __resolver__: nmk_python.version.PythonSupportedVersionsResolver
+  # Python version stamp file
+  pythonVersionStamp: ${outputDir}/.pythonversion
+
+  # Python supported versions range (min-max)
+  pythonMinVersion: "3.10"
+  pythonMaxVersion: "3.14"
+  pythonSupportedVersions:
+    __resolver__: nmk_python.version.PythonSupportedVersionsResolver
 
 tasks:
-    # To refresh python version stamp file
-    py.version:
-        description: Refresh python version
-        emoji: ":snake:.:label: "
-        input: ${gitVersionStamp}
-        output: ${pythonVersionStamp}
-        params:
-            version: ${pythonVersion}
-        silent: true
-        builder: nmk_python.version.PythonVersionRefresh
-        deps:
-            - git.version
-        appendToDeps: setup
+  # To refresh python version stamp file
+  py.version:
+    description: Refresh python version
+    emoji: ":snake:.:label: "
+    input: ${gitVersionStamp}
+    output: ${pythonVersionStamp}
+    params:
+      version: ${pythonVersion}
+    silent: true
+    builder: nmk_python.version.PythonVersionRefresh
+    deps:
+      - git.version
+    appendToDeps: setup

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nmk-python
-Version: 1.10.3
+Version: 1.11.0
 Summary: Python plugin for nmk build system
 Author: The dynod project
 Maintainer: The dynod project
@@ -22,6 +22,7 @@ Requires-Dist: Jinja2
 Requires-Dist: tomlkit
 Requires-Dist: setuptools
 Requires-Dist: wheel
+Requires-Dist: setuptools-scm
 Requires-Dist: build
 Requires-Dist: ruff
 Requires-Dist: pytest-xdist

{nmk_python-1.10.3.dist-info → nmk_python-1.11.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=K-ZPBSN0YgWQqS4Nz2tRg-y2zTFvcutDiNR7Ii1NrMY,12979
-nmk_python/build.yml,sha256=kkaJV535tgcfDV65Pjxfh4HMexCS3muQ5oazFtqgYXI,5958
+nmk_python/build.py,sha256=kcixJP5-YgKBKJ-gVtHpvyI3WvjmVHgwEgL9e3OJBNU,14860
+nmk_python/build.yml,sha256=p_ziFqTxNqPn6hvLyHtutVJVVmlXqbkr7TbFo64_45w,6336
 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,8 +11,8 @@ 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=fLpOWdujYwlJB7XhWaOGCTeg3gQaClk2YHoRkkW64dE,3109
-nmk_python/version.yml,sha256=WpZyQ2mChmvA_6eVb_Yp6ZaFIkX6oINxWBhKgb8h4GE,833
+nmk_python/version.py,sha256=w15Zk7_TgqEsVSFN7Ql71-5gO5yOXoIYRdI_QlvMjYI,2738
+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/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,7 +21,7 @@ nmk_python/backends/factory.py,sha256=NMYByORffwSSIjeNMLkOnwh6x1xhJQVhoV-0rSooq6
 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/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nmk_python/templates/build.toml.jinja,sha256=6F1Kdb32JVBWEitxLC7AsUdhx2VTyQEyWhhSb7n3oBs,1770
+nmk_python/templates/build.toml.jinja,sha256=D-RYPUGiqkYUKyQt_dP_tNFU-83eer7bnv57k4pMmIw,2137
 nmk_python/templates/pytest.toml.jinja,sha256=zQ3SRWnF23Omxm7zInE54j0l3OyjXSOn5pQ5Pak8Boo,641
 nmk_python/templates/python-settings.json.jinja,sha256=v-GlXJSGdtfaEZIinSC_aT54rlKArFe1RZ-BgPdbANM,666
 nmk_python/templates/python-test-debug-launch.json.jinja,sha256=J_xju2EpHNXvgvqBxlf99p7g-ZMh3xE-_2r7o_57gpU,364
@@ -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.10.3.dist-info/licenses/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
-nmk_python-1.10.3.dist-info/METADATA,sha256=4IagnIbEAXFlSZ2U0s1Qnmp9pMQDVwwQEkPcqQiM8mU,3175
-nmk_python-1.10.3.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-nmk_python-1.10.3.dist-info/entry_points.txt,sha256=QLXIIXl6wODHDnVkh7KuiLv_XzfFtNfdWwpxyB675ak,88
-nmk_python-1.10.3.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
-nmk_python-1.10.3.dist-info/RECORD,,
+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,,