nmk-python 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

nmk_python/build.py

@@ -9,7 +9,7 @@ from pathlib import Path
 
 from nmk.model.builder import NmkTaskBuilder
 from nmk.model.keys import NmkRootConfig
-from nmk.model.resolver import NmkStrConfigResolver
+from nmk.model.resolver import NmkListConfigResolver, NmkStrConfigResolver
 from nmk.utils import is_windows, run_pip, run_with_logs
 from nmk_base.venvbuilder import VenvUpdateBuilder
 from tomlkit import loads
@@ -176,3 +176,15 @@ class EditableBuilder(NmkTaskBuilder):
 
             # Touch stamp file
             self.main_output.touch()
+
+
+class PythonOptionalDepsResolver(NmkListConfigResolver):
+    """
+    Python optional deps resolver
+    """
+
+    def get_value(self, name: str, groups: dict[str, list[str]]) -> list[str]:
+        """
+        Turn dependency options deps dict into a merged list of dependencies
+        """
+        return sorted(list(set(dependency for deps in groups.values() for dependency in deps)))

nmk_python/build.yml

@@ -21,10 +21,25 @@ config:
     pythonProjectFileFragments:
         - ${BASEDIR}/templates/build.toml.jinja
 
-    # Python package dependencies (also contributed to venv)
+    # Python optional deps (named groups of python package optional dependencies)
+    pythonPackageOptionalRequirements: {}
+
+    # Derived list of python dependencies from the dependency groups
+    pythonPackageOptionalRequirementsList:
+        __resolver__: nmk_python.build.PythonOptionalDepsResolver
+        params:
+            groups: ${pythonPackageOptionalRequirements}
+    pythonProjectFileItems:
+        project:
+            optional-dependencies: ${pythonPackageOptionalRequirements}
+
+    # Python package dependencies
     pythonPackageRequirements: []
+
+    # Also install in venv all dependencies
     venvPkgDeps:
         - ${pythonPackageRequirements}
+        - ${pythonPackageOptionalRequirementsList}
 
     # Extra (external) resources to be bundled in built python wheel
     pythonExtraResources: {}

nmk_python/ruff.py

@@ -7,6 +7,7 @@ from pathlib import Path
 
 from nmk.model.builder import NmkTaskBuilder
 from nmk.model.keys import NmkRootConfig
+from nmk.model.resolver import NmkStrConfigResolver
 from nmk.utils import run_with_logs
 
 
@@ -35,7 +36,23 @@ class RuffBuilder(NmkTaskBuilder):
             relative_src_folders.append(p)
 
         # Delegate to ruff
-        run_with_logs(["ruff", command] + relative_src_folders, self.logger, cwd=project_folder)
+        run_with_logs(["ruff"] + [arg for arg in command.split(" ") if arg] + relative_src_folders, self.logger, cwd=project_folder)
 
         # Touch output file
         self.main_output.touch()
+
+
+class JoinedRulesResolver(NmkStrConfigResolver):
+    """
+    Join auto-fix rules as a comma separated string
+    """
+
+    def get_value(self, name: str, rules: list[str]) -> str:
+        """
+        Return coma separated rules list string
+
+        :param name: name of the config
+        :param rules: list of rules
+        :return: coma separated rules list string
+        """
+        return ",".join(rules)

nmk_python/ruff.yml

@@ -9,8 +9,23 @@ config:
 
     # Stamp files for ruff execution
     pythonRuffFormatStamp: ${outputDir}/.ruff-format
+    pythonRuffFixStamp: ${outputDir}/.ruff-fix
     pythonRuffCheckStamp: ${outputDir}/.ruff-check
 
+    # Extra arguments for ruff command lines
+    pythonRuffCommonExtraArgs: ""
+    pythonRuffFormatExtraArgs: ""
+    pythonRuffFixExtraArgs: ""
+    pythonRuffCheckExtraArgs: ""
+
+    # Auto-fix rules
+    pythonAutoFixRules: ["I"] # Default: only fix imports
+    pythonAutoFixJoinedRules:
+        __resolver__: nmk_python.ruff.JoinedRulesResolver
+        params:
+            rules:
+                - ${pythonAutoFixRules}
+
     # Ignored rules
     pythonIgnoredRules:
         - E203 # space before ":"; sometimes formatting with black introduces this kind of space in slice expressions
@@ -39,14 +54,32 @@ tasks:
         builder: nmk_python.ruff.RuffBuilder
         params:
             src_folders: ${pythonSrcFolders}
-            command: format
+            command: format ${pythonRuffCommonExtraArgs} ${pythonRuffFormatExtraArgs}
+
+    # Python source code fix with ruff
+    py.fix:
+        description: Fix python code
+        emoji: ":snake:.:wrench:"
+        deps:
+            - py.format
+        appendToDeps: build
+        if: ${pythonSrcFiles}   # Only if python source files are found
+        output:
+            - ${pythonRuffFixStamp}
+        input:
+            - ${pythonProjectFile}
+            - ${pythonSrcFiles}
+        builder: nmk_python.ruff.RuffBuilder
+        params:
+            src_folders: ${pythonSrcFolders}
+            command: check --fix-only --select ${pythonAutoFixJoinedRules} ${pythonRuffCommonExtraArgs} ${pythonRuffFixExtraArgs}
 
     # Python source code analysis with ruff
     py.analyze:
         description: Analyze python code
         emoji: ":snake:.:eye: "
         deps:
-            - py.format
+            - py.fix
         appendToDeps: build
         if: ${pythonSrcFiles}   # Only if python source files are found
         output:
@@ -57,4 +90,4 @@ tasks:
         builder: nmk_python.ruff.RuffBuilder
         params:
             src_folders: ${pythonSrcFolders}
-            command: check
+            command: check ${pythonRuffCommonExtraArgs} ${pythonRuffCheckExtraArgs}

{nmk_python-1.1.0.dist-info → nmk_python-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nmk-python
-Version: 1.1.0
+Version: 1.3.0
 Summary: Python plugin for nmk build system
 Author: The dynod project
 Maintainer: The dynod project
@@ -26,6 +26,7 @@ Requires-Dist: ruff
 Requires-Dist: pytest-xdist
 Requires-Dist: pytest-cov
 Requires-Dist: pytest-multilog
+Dynamic: license-file
 
 # nmk-python
 Python plugin for nmk build system
@@ -43,7 +44,7 @@ Python plugin for nmk build system
 
 This plugin adds support for Python development in an **`nmk`** project:
 * project file generation
-* code format and analysis with [ruff](https://astral.sh/ruff)
+* code format, fix and analysis with [ruff](https://astral.sh/ruff)
 * python wheel build
 * test with [pytest](https://pytest.org)
 * VSCode settings generation (if [**`nmk-vscode`**](https://github.com/dynod/nmk-vscode) plugin is also used)

{nmk_python-1.1.0.dist-info → nmk_python-1.3.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 nmk_python/__init__.py,sha256=EouCWXbAeObby1vOCx0Vx_WaGC2fEEFDMCen3JZt4TU,446
 nmk_python/badges.yml,sha256=LzElZecCXKxdF-oPkvIwfnbQlOcAM_zUj6MelClmAug,749
-nmk_python/build.py,sha256=rN7CvAUPU-gGsg17cBojdqGBSbW-GAEFItz234rqM1E,6307
-nmk_python/build.yml,sha256=Yn4zVuNNo1fnAsvlI_ul_kmEpLp_5WHK4pA0T9kkQ3I,4297
+nmk_python/build.py,sha256=K8BowkROfrGwOPk7wKwOo9fsWJrrk8bDqJqliC876WI,6716
+nmk_python/build.yml,sha256=WLSVQN1y4zqGHyMZxa4GlMuOZNyvV_NJvjOLJCVvdDs,4860
 nmk_python/doc.yml,sha256=12amAlYylH7JAHaqBIOoEZ_LrXY_bPNKuHrrwUkIj8w,932
 nmk_python/files.py,sha256=gtPf6ldR5F4oGsAdzFnEIbI9MqqvF3z5JQnyONZmLmk,1863
 nmk_python/files.yml,sha256=-vGjogdulwsfdKVEUa5RARYDKxF3m9RmHKFnIhaT3_k,780
 nmk_python/plugin.yml,sha256=hi7osXyIwpHgJAsww5mhOA6emxhzgitDF8cOsvyY29Y,1068
 nmk_python/project.yml,sha256=sRIMvKkasrYlIvOo3DsVyNM_sgID_sHVgZg_bSIqtfw,975
-nmk_python/ruff.py,sha256=tfqC66NEB3P1FID1qzP-Ba3hafF02A1I9GIeruGUW2U,1058
-nmk_python/ruff.yml,sha256=09ackKHfT9oXKqIniYUehFkyW2DUxlHl5Ak5x2tlvQQ,1808
+nmk_python/ruff.py,sha256=TBmn5nFflcFRvjj36JtJGJ-GYHOK6XfhK9Jp-2dO5_E,1557
+nmk_python/ruff.yml,sha256=FNmYjbv2l5vlqFXinY87LfgzpZ3PSiduB_xUiYw8aMw,3019
 nmk_python/tests.py,sha256=8kRKP3dT2Thi5W5sCQSQOPXkV1D9C7tde3QYySo6G2c,1212
 nmk_python/tests.yml,sha256=wQusYK1bxSl87zWFQy5lJcrkcAz4pMEZT9Vt6o2K5Vs,1538
 nmk_python/version.py,sha256=fLpOWdujYwlJB7XhWaOGCTeg3gQaClk2YHoRkkW64dE,3109
@@ -19,8 +19,8 @@ nmk_python/templates/pytest.toml.jinja,sha256=zQ3SRWnF23Omxm7zInE54j0l3OyjXSOn5p
 nmk_python/templates/python-settings.json.jinja,sha256=-6J1tybWEzChxlDqu4tp9BMWxbYD8HpztGs9G8LkC_w,877
 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.1.0.dist-info/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
-nmk_python-1.1.0.dist-info/METADATA,sha256=xdcI0iJEVV_3VQQHdj2m0oEo5ith5CAhcSMQSXM2CWo,3118
-nmk_python-1.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nmk_python-1.1.0.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
-nmk_python-1.1.0.dist-info/RECORD,,
+nmk_python-1.3.0.dist-info/licenses/LICENSE,sha256=PROo9EW7wP6jmSr_90OluItAsIB411b_CAqEBioMKpI,1074
+nmk_python-1.3.0.dist-info/METADATA,sha256=C_R9ask9HqHqC8qFlgU6PrHRXe9leUBOQCu8a3KC798,3145
+nmk_python-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nmk_python-1.3.0.dist-info/top_level.txt,sha256=MCb5w_hoOZ0kk3Dajxrd9Pz6lZ3pyuS6TQCRA3vddTo,11
+nmk_python-1.3.0.dist-info/RECORD,,

{nmk_python-1.1.0.dist-info → nmk_python-1.3.0.dist-info}/WHEEL

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