nmk-python 1.8.0__py3-none-any.whl → 1.8.2__py3-none-any.whl

nmk_python/backends/build_backend.py

@@ -6,7 +6,7 @@ from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import cast
 
-from nmk._internal.envbackend_legacy import EnvBackend  # For type hinting
+from nmk.envbackend import EnvBackend
 from nmk.model.model import NmkModel
 
 

nmk_python/build.py

@@ -10,7 +10,7 @@ from itertools import product
 from pathlib import Path
 from typing import cast
 
-from nmk._internal.envbackend_legacy import EnvBackend  # For type hinting
+from nmk.envbackend import EnvBackend
 from nmk.logs import NmkLogWrapper
 from nmk.model.builder import NmkTaskBuilder
 from nmk.model.model import NmkModel
@@ -243,6 +243,11 @@ class PythonArchiveDepsResolver(NmkDictConfigResolver):
         return out
 
 
+# Internal/external dependencies keys
+_INTERNAL_DEPS_KEY = "internal"
+_EXTERNAL_DEPS_KEY = "external"
+
+
 class DepsMetadataBuilder(NmkTaskBuilder):
     """
     Generate python dependencies metadata file
@@ -263,18 +268,22 @@ class DepsMetadataBuilder(NmkTaskBuilder):
         # Prepare distributions map
         distributions = {normalize(d.name): d for d in importlib.metadata.distributions()}
         assert root_name in distributions, f"Root package '{root_name}' not found in installed distributions"
-        output_data: dict[str, str] = {}
+        output_data: dict[str, dict[str, str]] = {_INTERNAL_DEPS_KEY: {}, _EXTERNAL_DEPS_KEY: {}}
 
         # Visitor implementation
         def visit(name: str):
             # Already visited or unknown?
-            if (name in output_data) or (name not in distributions):
+            if (name in output_data[_INTERNAL_DEPS_KEY]) or (name in output_data[_EXTERNAL_DEPS_KEY]) or (name not in distributions):
                 return
 
-            # If this is a local project, don't add metadata
-            if (name != root_name) and not any(fnmatch(name, pattern) for pattern in local_deps):
-                # Keep versions
-                output_data[name] = distributions[name].version
+            # Check for internal/external dependency
+            if name != root_name:
+                if any(fnmatch(name, pattern) for pattern in local_deps):
+                    # Internal dependency
+                    output_data[_INTERNAL_DEPS_KEY][name] = distributions[name].version
+                else:
+                    # External dependency
+                    output_data[_EXTERNAL_DEPS_KEY][name] = distributions[name].version
 
             # Visit dependencies
             for dep in distributions[name].requires or []:
@@ -292,4 +301,12 @@ class DepsMetadataBuilder(NmkTaskBuilder):
         visit(root_name)
 
         # Write output metadata file
-        self.main_output.write_text(json.dumps({k: output_data[k] for k in sorted(output_data)}, indent=4))
+        self.main_output.write_text(
+            json.dumps(
+                {
+                    _EXTERNAL_DEPS_KEY: {k: output_data[_EXTERNAL_DEPS_KEY][k] for k in sorted(output_data[_EXTERNAL_DEPS_KEY])},
+                    _INTERNAL_DEPS_KEY: {k: output_data[_INTERNAL_DEPS_KEY][k] for k in sorted(output_data[_INTERNAL_DEPS_KEY])},
+                },
+                indent=4,
+            )
+        )

{nmk_python-1.8.0.dist-info → nmk_python-1.8.2.dist-info}/METADATA

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

{nmk_python-1.8.0.dist-info → nmk_python-1.8.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 nmk_python/__init__.py,sha256=EouCWXbAeObby1vOCx0Vx_WaGC2fEEFDMCen3JZt4TU,446
 nmk_python/badges.yml,sha256=LzElZecCXKxdF-oPkvIwfnbQlOcAM_zUj6MelClmAug,749
-nmk_python/build.py,sha256=bzpS1lUotsgdwBJH6Jgl2guAva1M0XDlKzwfj_lfZ1Y,11368
+nmk_python/build.py,sha256=xtgcD1_9mPnqVCR9jubM0S_trWV1GsPL4DQrDIKdIvI,12045
 nmk_python/build.yml,sha256=8CWVacVv3r3pbvuRkaLQbH1aTO-oK4U0hAO9SgDTfFA,5726
 nmk_python/doc.yml,sha256=12amAlYylH7JAHaqBIOoEZ_LrXY_bPNKuHrrwUkIj8w,932
 nmk_python/files.py,sha256=K6Y-XKXuf8jh4x333Qgj6G1MyB-BgZ5Kd2-XCZhsfR4,2000
@@ -14,7 +14,7 @@ nmk_python/tests.yml,sha256=Sg6ZezkBVuvOzh-4QbJmZQymCOzXfenc0EpMdMZsEBc,1687
 nmk_python/version.py,sha256=fLpOWdujYwlJB7XhWaOGCTeg3gQaClk2YHoRkkW64dE,3109
 nmk_python/version.yml,sha256=WpZyQ2mChmvA_6eVb_Yp6ZaFIkX6oINxWBhKgb8h4GE,833
 nmk_python/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nmk_python/backends/build_backend.py,sha256=NOAXMa6jmAIfUvA690ht-x_DwsGtvBvttPZLfFcX_b0,1437
+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=QpN5nMm_QhnKzoHQcX4769OOQG6NqOD2ctYXyH2MI7A,1880
@@ -24,8 +24,8 @@ nmk_python/templates/pytest.toml.jinja,sha256=zQ3SRWnF23Omxm7zInE54j0l3OyjXSOn5p
 nmk_python/templates/python-settings.json.jinja,sha256=jYXSy96cX9X9GIHoF7XiZDzd4P2GOlMisAVWW626WF4,749
 nmk_python/templates/python-test-debug-launch.json.jinja,sha256=J_xju2EpHNXvgvqBxlf99p7g-ZMh3xE-_2r7o_57gpU,364
 nmk_python/templates/ruff.toml.jinja,sha256=DTHe1ixK1SBY8d2xBCfkGz89HzjAoMO7Ogs12AY1i4Y,346
-nmk_python-1.8.0.dist-info/licenses/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
-nmk_python-1.8.0.dist-info/METADATA,sha256=wW1y07Ek_meONzj-P7sZd9h_8d1tEsKMKN7xm-DD2pQ,3148
-nmk_python-1.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nmk_python-1.8.0.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
-nmk_python-1.8.0.dist-info/RECORD,,
+nmk_python-1.8.2.dist-info/licenses/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
+nmk_python-1.8.2.dist-info/METADATA,sha256=jOPufl401DVU08YM7Mp9QUeqKF-3NESvd5OFpQ2ciOo,3148
+nmk_python-1.8.2.dist-info/WHEEL,sha256=YLJXdYXQ2FQ0Uqn2J-6iEIC-3iOey8lH3xCtvFLkd8Q,91
+nmk_python-1.8.2.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
+nmk_python-1.8.2.dist-info/RECORD,,

{nmk_python-1.8.0.dist-info → nmk_python-1.8.2.dist-info}/WHEEL

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