nmk-python 0.13.4__py3-none-any.whl → 0.14.0__py3-none-any.whl

nmk_python/build.py

@@ -8,10 +8,10 @@ from nmk_base.venvbuilder import VenvUpdateBuilder
 
 
 class PackageBuilder(NmkTaskBuilder):
-    def build(self, setup: str, artifacts: str):
+    def build(self, artifacts: str, build_dir: str):
         # Delegate to setup
         run_with_logs(
-            [sys.executable, setup, "sdist", "-d", artifacts, "bdist_wheel", "-d", artifacts],
+            [sys.executable, "-c", "from setuptools import setup; setup()", "build", "-b", build_dir, "bdist_wheel", "-d", artifacts],
             self.logger,
             cwd=self.model.config[NmkRootConfig.PROJECT_DIR].value,
         )

nmk_python/build.yml

@@ -8,6 +8,9 @@ config:
     # Python artifacts directory
     pythonArtifacts: ${outputDir}/artifacts
 
+    # Python build directory
+    pythonBuildDir: ${outputDir}/python
+
     # Python source distribution + wheel artifacts
     pythonDist: ${pythonArtifacts}/${pythonPackage}-${pythonVersion}.tar.gz
     pythonWheel: ${pythonArtifacts}/${pythonPackageForWheel}-${pythonVersion}-py3-none-any.whl
@@ -29,7 +32,6 @@ config:
         - "*.egg-info/"
         - "*.pyc"
         - __pycache__
-        - build/
 
     # Additional github publish step: publish on pypi.org
     githubPublishSteps:
@@ -59,8 +61,8 @@ tasks:
             - ${pythonSetupCfg}
         builder: nmk_python.build.PackageBuilder
         params:
-            setup: ${pythonSetupPy}
             artifacts: ${pythonArtifacts}
+            build_dir: ${pythonBuildDir}
 
     # Python module install
     py.install:

nmk_python/setup.py

@@ -1,4 +1,4 @@
-import shutil
+import platform
 from configparser import ConfigParser
 from pathlib import Path
 from typing import List, Union
@@ -11,15 +11,24 @@ LIST_SEPARATOR = "\n"
 
 class PythonSupportedVersionsResolver(NmkListConfigResolver):
     def get_value(self, name: str) -> List[str]:
+        def split_version(v: str) -> List[int]:
+            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_split, max_split = list(map(int, min_ver.split("."))), list(map(int, max_ver.split(".")))
+        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"
         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"
 
+        # Also verifies current runtime is in range
+        p_ver = platform.python_version()
+        cur_split = split_version(p_ver)
+        assert cur_split[0] == max_split[0], prefix + f"current python major version ({p_ver}) doesn't match with supported versions range"
+        assert min_split[1] <= cur_split[1] <= max_split[1], prefix + f"current python version ({p_ver}) is out of supported versions range"
+
         # Iterate and return versions range
         return [f"{min_split[0]}.{sub}" for sub in range(min_split[1], max_split[1] + 1)]
 
@@ -29,13 +38,9 @@ class PythonSetupBuilder(TemplateBuilder):
         # Turn list into a single block of text values
         return (LIST_SEPARATOR + LIST_SEPARATOR.join([self.relative_path(str(v)) for v in values])) if isinstance(values, list) else values
 
-    def build(self, setup_py_template: str, setup_cfg_files: List[str], setup_items: dict):
-        # Copy setup.py
-        setup_py_output = self.outputs[0]
-        shutil.copyfile(Path(setup_py_template), setup_py_output)
-
+    def build(self, setup_cfg_files: List[str], setup_items: dict):
         # Merge setup fragments to generate final setup
-        setup_cfg_output = self.outputs[1]
+        setup_cfg_output = self.main_output
         c = ConfigParser()
         for f_path in map(Path, setup_cfg_files):
             # Update config with rendered template

nmk_python/setup.yml

@@ -1,26 +1,21 @@
 config:
     # Generated setup config files
     pythonSetupCfg: ${PROJECTDIR}/setup.cfg
-    pythonSetupPy: ${PROJECTDIR}/setup.py
 
     # Paths to setup.cfg fragments to be merged
     pythonSetupCfgFiles: []
 
-    # Template for setup.py file
-    pythonSetupPyTemplate: ${BASEDIR}/templates/setup.py
-
     # Contributed setup items from yml files
     pythonSetupItems: {}
 
     # Python supported versions range (min-max)
     pythonMinVersion: "3.8"
-    pythonMaxVersion: "3.11"
+    pythonMaxVersion: "3.12"
     pythonSupportedVersions:
         __resolver__: nmk_python.setup.PythonSupportedVersionsResolver
 
     # Contribute to gitignore
     gitIgnoredFiles:
-        - ${pythonSetupPy}
         - ${pythonSetupCfg}
 
 tasks:
@@ -28,11 +23,9 @@ tasks:
         description: Generate python setup files
         emoji: ":snake:.:toolbox:"
         input:
-            - ${pythonSetupPyTemplate}
             - ${pythonSetupCfgFiles}
             - ${pythonVersionStamp}
         output:
-            - ${pythonSetupPy}
             - ${pythonSetupCfg}
         deps:
             - py.version
@@ -40,6 +33,5 @@ tasks:
         if: ${pythonSrcFiles}   # Only if python source files are found
         builder: nmk_python.setup.PythonSetupBuilder
         params:
-            setup_py_template: ${pythonSetupPyTemplate}
             setup_cfg_files: ${pythonSetupCfgFiles}
             setup_items: ${pythonSetupItems}

{nmk_python-0.13.4.dist-info → nmk_python-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nmk-python
-Version: 0.13.4
+Version: 0.14.0
 Summary: Python plugin for nmk build system
 Home-page: https://github.com/dynod/nmk-python
 Author: The dynod project
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nmk-base
@@ -22,7 +23,7 @@ Python plugin for nmk build system
 [![License: MPL](https://img.shields.io/github/license/dynod/nmk-python?color=green)](https://github.com/dynod/nmk-python/blob/main/LICENSE)
 [![Checks](https://img.shields.io/github/actions/workflow/status/dynod/nmk-python/build.yml?branch=main&label=build%20%26%20u.t.)](https://github.com/dynod/nmk-python/actions?query=branch%3Amain)
 [![Issues](https://img.shields.io/github/issues-search/dynod/nmk?label=issues&query=is%3Aopen+is%3Aissue+label%3Aplugin%3Apython)](https://github.com/dynod/nmk/issues?q=is%3Aopen+is%3Aissue+label%3Aplugin%3Apython)
-[![Supported python versions](https://img.shields.io/badge/python-3.8%20--%203.11-blue)](https://www.python.org/)
+[![Supported python versions](https://img.shields.io/badge/python-3.8%20--%203.12-blue)](https://www.python.org/)
 [![PyPI](https://img.shields.io/pypi/v/nmk-python)](https://pypi.org/project/nmk-python/)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Flake8 analysis result](https://img.shields.io/badge/flake8-0-green)](https://flake8.pycqa.org/)

{nmk_python-0.13.4.dist-info → nmk_python-0.14.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 nmk_python/__init__.py,sha256=pVT-8I5dH_SkG5OQBtnOyIrWTtBh16mdua0Rah5ADPw,705
 nmk_python/badges.yml,sha256=TaauzvFP9KIiudSeq-YihcaZACKis6wwF526miVOguw,926
-nmk_python/build.py,sha256=achAaE64DrRt6UXmFm3r2jM5BZblN8b4Xemji0qXoLQ,1090
-nmk_python/build.yml,sha256=KDT1zdtEvVJW1C1oXU3b6n4bRAws7ltxoLfAiEDeKIY,2594
+nmk_python/build.py,sha256=y5W5mcn0ZYSvFC28cxxxOtpm2qodiVFAANxMtBBVKpg,1134
+nmk_python/build.yml,sha256=_a4uEFIYa5wuP6lJhn5sKYfp5sdzrVpy7hgq-j7Uhyw,2652
 nmk_python/doc.yml,sha256=12amAlYylH7JAHaqBIOoEZ_LrXY_bPNKuHrrwUkIj8w,932
 nmk_python/files.py,sha256=2loPwmbZdqYNod6ML85s0dpBY4jx6--AB5M2zQLzi5s,1152
 nmk_python/files.yml,sha256=fg8oPpTdjOSquIWw_cqcn5UyXfQHZzCVNSyHc95wfvE,703
@@ -10,8 +10,8 @@ nmk_python/flake.yml,sha256=FaoIzqVuD_YxbW6YruuO-Sfm0YAiwpztOdZv_evJvNA,1701
 nmk_python/format.py,sha256=JQCtKrWB8IsGzcqRTBZ7AbsVe6eG50sFibucj8ig4Ls,546
 nmk_python/format.yml,sha256=3R2Bhbg3AZRV8YgKVBjGY8WnnNJA-28GS867RDeW2AY,1068
 nmk_python/plugin.yml,sha256=ZXP1G7n6zrEu9H50_H_1XqDG-vE09x8SMJJpai7niQ8,1139
-nmk_python/setup.py,sha256=i0AhL9FFgkOcQVkwwH0O2xjh6GPSfCEbCZhJ7-CkXn0,2659
-nmk_python/setup.yml,sha256=zeqHvQEEa-JvY14AdcxSpeJ68aTrvQh9ytGxeb4-Bdc,1354
+nmk_python/setup.py,sha256=URmntiw4rCe999CgRoO7EhnvvYyO1NAeeO42qplzY2M,2995
+nmk_python/setup.yml,sha256=glSyp98_OwoZbJSgoopgkCFiUeKkbkCntLQTSl4S8sw,1068
 nmk_python/tests.py,sha256=rKKJKKx4g3C6TAVR_aNhsgPlMN3bU61dUqKx3seqq4s,935
 nmk_python/tests.yml,sha256=-rMWZC5PeadjOQu82d_OpmupFDs4Q1mzU3XxZBBlLTM,1825
 nmk_python/version.py,sha256=f-b--EYQMw2G2I8gCeMHDwOM8OQC8nu_a2cEtkAS6rQ,1278
@@ -23,9 +23,8 @@ nmk_python/templates/isort.cfg,sha256=7ZGCSLYAm1ZPmREwzDQS718e8Zp3Aa7ETtX5uuVxvR
 nmk_python/templates/pytest.cfg,sha256=m1oCLagZkiwimF4qES5d6BEMJRZm_SiqZMllJK5fj9E,561
 nmk_python/templates/python-settings.json.jinja,sha256=nwuuBJwj-nY6q5d1bBhnCV4nVa1YZvhm7QGBM2fubCM,1094
 nmk_python/templates/python-test-debug-launch.json.jinja,sha256=J_xju2EpHNXvgvqBxlf99p7g-ZMh3xE-_2r7o_57gpU,364
-nmk_python/templates/setup.py,sha256=mvQPLGpb840eTFw3tsRMvQzq6c3cQ4WHMnBzK1PJT_E,61
-nmk_python-0.13.4.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-nmk_python-0.13.4.dist-info/METADATA,sha256=zhnoupPiv0XYYeFWwI2rt-f7niM6QS6pfw6D6Y3zTPM,2798
-nmk_python-0.13.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-nmk_python-0.13.4.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
-nmk_python-0.13.4.dist-info/RECORD,,
+nmk_python-0.14.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+nmk_python-0.14.0.dist-info/METADATA,sha256=vjQjoXs_pVJU6jhe7oD2iAn5TDKf7MNSQaXAivLxkuU,2849
+nmk_python-0.14.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+nmk_python-0.14.0.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
+nmk_python-0.14.0.dist-info/RECORD,,

nmk_python/templates/setup.py

@@ -1,4 +0,0 @@
-#!/usr/bin/env python3
-from setuptools import setup
-
-setup()