Use pyproject.toml by default and fix config merger

CHANGELOG.md

@@ -6,18 +6,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Python now generates a `run` command and cli entry point for clients and services.
+
+### Changed
+- Python now uses `pyproject` instead of `setuptools` by default. Template for targetSetup
+  has been updated accordingly. It also conforms to `ruff`s checks and formatting by default.
+
+### Fixed
+- Python's config merger now handles mypy overrides targeting multiple packages.
+
 ## [5.0.0] - 2024-10-15
 
-## Added
+### Added
 - `input` parameter to `mkPlatform` for C. This controls what target
   gets used for dependent components.
 
-## Removed
+### Removed
 - `targetName` no longer gets sent to the `mk*` functions for C.
 
 ## [4.1.5] - 2024-09-13
 
-## Fixed
+### Fixed
 - Overriding the factory of a C platform caused the 'override' function
   to disappear from the resulting set.
 - `output` now works as expected on C platforms. Previously, setting
@@ -26,14 +36,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [4.1.4] - 2024-06-03
 
-## Fixed
+### Fixed
 - Python check runner not finding config when not in root of component.
 - Fix some outside tools not getting check configs because TMP is not
   always set.
 
 ## [4.1.3] - 2024-03-22
 
-## Fixed
+### Fixed
 - Flake8 not getting configuration.
 
 ## [4.1.2] - 2024-03-22

python/component-template/@mainPackage@/main.py

@@ -1,6 +1,6 @@
-""" @desc@ """
+"""@desc@"""
 
 
 def main() -> None:
-    """ main function of @mainPackage@ """
+    """Main function of @mainPackage@."""
     raise NotImplementedError

python/component-template/pyproject.toml

@@ -0,0 +1,18 @@
+[build-system]
+requires = ["setuptools"]
+
+[project]
+name = "@pname@"
+version = "@version@"
+description = "@desc@"
+authors = [{name = "@author@", email = "@email@"}]
+
+[setuptools.packages.find]
+exclude = ["tests*"]
+
+[urls]
+Homepage = "@url@"
+
+[project.scripts]
+@entryPoint@
+

python/component-template/tests/test_main.py

@@ -1,6 +1,7 @@
-""" Tests for @mainPackage@ in @pname@ """
+"""Tests for @mainPackage@ in @pname@."""
 import @mainPackage@.main
 
+
 def test_main() -> None:
-    """ Tests for the main function """
+    """Tests for the main function."""
     @mainPackage@.main.main()

python/hooks/config-merger.py

@@ -82,12 +82,12 @@ def mypy_overrides(config_file, key) -> dict:
 
     root = {}
     for override in overrides:
-        module_name = f'mypy-{override.pop("module")}'
-        root.update(
-            {
-                module_name: override,
-            }
-        )
+        modules = override.pop("module")
+        if not isinstance(modules, list):
+            modules = [modules]
+        for module in modules:
+            module_name = f'mypy-{module}'
+            root.setdefault(module_name, {}).update(override)
     to_remove = config_file
     for remove_key in keys[:-1]:
         to_remove = to_remove.get(remove_key)

python/main.py.in

@@ -0,0 +1,3 @@
+
+if __name__ == "__main__":
+    main()

python/package.nix

@@ -71,21 +71,26 @@ let
       inherit version;
       pname = name;
       mainPackage = lib.toLower (builtins.replaceStrings [ "-" " " ] [ "_" "_" ] name);
-      entryPoint = if setuptoolsLibrary then "{}" else "{\\\"console_scripts\\\": [\\\"${name}=${mainPackage}.main:main\\\"]}";
+      entryPoint = if setuptoolsLibrary then "" else "${name}=\\\"${mainPackage}.main:main\\\"";
     } // args.targetSetup.variables or { };
     variableQueries = {
       desc = "✍️ Write a short description for your component:";
       author = "🤓 Enter author name:";
       email = "📧 Enter author email:";
       url = "🏄 Enter author website url:";
     } // args.targetSetup.variableQueries or { };
-    initCommands = "black .";
+    initCommands = ''
+      ${if ! setuptoolsLibrary then "cat ${./main.py.in} >>$mainPackage/main.py" else ""}
+      ruff format .
+      ruff check --fix --unsafe-fixes .
+    '';
   });
 
   pythonPackageArgs = attrs // {
     inherit version preBuild doStandardTests pythonVersion propagatedBuildInputs;
     src = if lib.isStorePath src then src else filteredSrc;
     pname = name;
+    format = attrs.format or "pyproject";
 
     # Don't install dependencies with pip, let nix handle that
     preInstall = ''
@@ -170,7 +175,16 @@ let
           Show the config Nedryland has generated for a linter, one of:
           black, coverage, flake8, isort, mypy, pylint, pytest'';
       };
-    } // attrs.shellCommands or { });
+    } // (
+      lib.optionalAttrs
+        (! setuptoolsLibrary)
+        {
+          run = {
+            script = ''python -m ${name}.main "$@"'';
+            description = "Run the main module.";
+          };
+        })
+    // attrs.shellCommands or { });
   };
 in
 pythonPkgs.buildPythonPackage pythonPackageArgs