dropped Python 3.9 support

and modernized the codebase to Python 3.10+

Author: jensens

.github/workflows/lint.yml

@@ -18,8 +18,8 @@ jobs:
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
 
-      - name: Set up Python 3.9
-        run: uv python install 3.9
+      - name: Set up Python 3.10
+        run: uv python install 3.10
 
       - name: Install Project
         run: make install

.github/workflows/test.yml

@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
@@ -21,10 +20,6 @@ jobs:
           - ubuntu-latest
           - macos-latest
           - windows-latest
-        exclude:
-          # GH does not support macos and python 3.9
-          - python-version: "3.9"
-            os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v5

.github/workflows/variants.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         python-version:
         # we test on lowest and highest supported versions
-        - "3.9"
+        - "3.10"
         - "3.14"
         os:
           - ubuntu-latest

CHANGES.md

@@ -2,6 +2,8 @@
 
 ## 1.3.1 (unreleased)
 
+- **Breaking**: Drop Python 3.9 support. Minimum Python version is now 3.10.
+- Feature: Modernize codebase to use Python 3.10+ features (PEP 604 union types, built-in generic types).
 - Critical fix: `SOURCES_TARGET` used mxdev wrongly with `-o` (offline) option.
   The offline option had a bug and was fixed in mxdev [#34](https://github.com/mxstack/mxdev/issues/34) and released with mxdev>=5.
   This fix switches from `-o` to the correct `-f` (no fetch from vcs).

docs/source/getting-started.md

@@ -73,6 +73,6 @@ Please follow  [GIT's official installation instructions](https://git-scm.com/do
 
 Install [make as described here](https://gist.github.com/evanwill/0207876c3243bbb6863e65ec5dc3f058#make)
 
-Further you need a [Python >=3.9 installation.](https://www.python.org/downloads/windows/).
+Further you need a [Python >=3.10 installation.](https://www.python.org/downloads/windows/).
 
 Dependent on the topics and domains you use, you may need to install additional software, but this is no different from Linux/OSX.

pyproject.toml

@@ -6,7 +6,7 @@ keywords = ["development", "deployment", "make"]
 authors = [
   {name = "MX Stack Developers", email = "[email protected]" }
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = { text = "BSD 2-Clause License" }
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -15,7 +15,6 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -92,8 +91,12 @@ lines_after_imports = 2
 
 [tool.mypy]
 ignore_missing_imports = true
-python_version = "3.9"
+python_version = "3.10"
 
 [tool.ruff]
+target-version = "py310"
 # Exclude a variety of commonly ignored directories.
 exclude = []
+
+[tool.ruff.lint]
+select = ["UP"]  # Enable pyupgrade rules for Python 3.10+ modernization

src/mxmake/main.py

@@ -98,7 +98,7 @@ def list_command(args: argparse.Namespace):
 
 
 def create_config(
-    prompt: bool, preseeds: typing.Union[typing.Dict[str, typing.Any], None]
+    prompt: bool, preseeds: dict[str, typing.Any] | None
 ):
     if prompt and preseeds:
         sys.stdout.write("Either use prompt or preseeds, not both\n")
@@ -134,7 +134,7 @@ def create_config(
         sys.exit(1)
 
     # obtain domains to include
-    domains: typing.List[Domain] = []
+    domains: list[Domain] = []
     for topic_name in topic_choice["topic"]:
         topic = get_topic(topic_name)
         all_fqns = [domain.fqn for domain in topic.domains]
@@ -154,14 +154,14 @@ def create_config(
                 for domain_name in preseeds["topics"][topic_name]
             ]
             sys.stdout.write(f"Collect domains for topic {topic_name} from preseeds.\n")
-            domains.extend((get_domain(fqn) for fqn in selected_fqns))
+            domains.extend(get_domain(fqn) for fqn in selected_fqns)
             continue
         if not prompt:
             sys.stdout.write(
                 f"- update topic {topic_name} with domains "
                 f"{', '.join([fqdn.split('.')[1] for fqdn in selected_fqns])}.\n"
             )
-            domains.extend((get_domain(fqn) for fqn in selected_fqns))
+            domains.extend(get_domain(fqn) for fqn in selected_fqns)
             continue
         domains_choice = inquirer.prompt(
             [
@@ -191,7 +191,7 @@ def create_config(
         settings_question = []
         for setting in settings:
             sfqn = f"{domain.fqn}.{setting.name}"
-            setting_default: typing.Union[typing.Any, object] = setting.default
+            setting_default: typing.Any | object = setting.default
             # use default setting from preseeds
             if preseeds:
                 unset = object()

src/mxmake/parser.py

@@ -13,12 +13,12 @@ class SettingMissing(Exception):
 class MakefileParser:
     def __init__(self, path: Path):
         self.path = path
-        self.fqns: typing.List = []
-        self.topics: typing.Dict = {}
-        self.settings: typing.Dict = {}
+        self.fqns: list = []
+        self.topics: dict = {}
+        self.settings: dict = {}
         self.parse()
 
-    def parse_fqns(self, lines: typing.List[str]):
+    def parse_fqns(self, lines: list[str]):
         for line in lines:
             if line.startswith("#:"):
                 fqn = line[2:].strip()
@@ -27,7 +27,7 @@ def parse_fqns(self, lines: typing.List[str]):
                 self.topics.setdefault(topic, [])
                 self.topics[topic].append(name)
 
-    def parse_settings(self, lines: typing.List[str]):
+    def parse_settings(self, lines: list[str]):
         for fqn in self.fqns:
             domain = get_domain(fqn)
             for setting in domain.settings:
@@ -37,7 +37,7 @@ def parse_settings(self, lines: typing.List[str]):
                 except SettingMissing:
                     continue
 
-    def parse_setting(self, lines: typing.List[str], name: str) -> str:
+    def parse_setting(self, lines: list[str], name: str) -> str:
         setting_missing = True
         setting_scope = False
         value = ""

src/mxmake/templates.py

@@ -25,12 +25,12 @@ def get_template_environment() -> Environment:
 class template:
     """Template decorator and registry."""
 
-    _registry: typing.Dict = dict()
+    _registry: dict = dict()
 
     def __init__(self, name: str) -> None:
         self.name = name
 
-    def __call__(self, ob: typing.Type["Template"]) -> typing.Type["Template"]:
+    def __call__(self, ob: type["Template"]) -> type["Template"]:
         ob.name = self.name
         self._registry[self.name] = ob
         return ob
@@ -53,7 +53,7 @@ class Template(abc.ABC):
 
     def __init__(
         self,
-        environment: typing.Union[Environment, None] = None,
+        environment: Environment | None = None,
     ) -> None:
         # XXX: if environment is None, default to ``get_template_environment``?
         self.environment = environment
@@ -71,7 +71,7 @@ def template_name(self) -> str:
         """Template name to use."""
 
     @abc.abstractproperty
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         """Variables for template rendering."""
 
     def write(self) -> None:
@@ -106,13 +106,13 @@ class MxIniBoundTemplate(Template):
     def __init__(
         self,
         config: mxdev.Configuration,
-        environment: typing.Union[Environment, None] = None,
+        environment: Environment | None = None,
     ) -> None:
         super().__init__(environment)
         self.config = config
 
     @property
-    def settings(self) -> typing.Dict[str, str]:
+    def settings(self) -> dict[str, str]:
         return self.config.hooks.get(ns_name(self.name), {})
 
 
@@ -123,7 +123,7 @@ class ShellScriptTemplate(Template):
 
 class EnvironmentTemplate(MxIniBoundTemplate):
     @property
-    def env(self) -> typing.Dict[str, str]:
+    def env(self) -> dict[str, str]:
         """Dict containing environment variables."""
         env_name = self.settings.get("environment")
         return self.config.hooks.get(ns_name(env_name), {}) if env_name else {}
@@ -155,15 +155,15 @@ def template_name(self) -> str:
         return f"{self.test_runner}-{self.target_name}"
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         return dict(
             description=self.description,
             env=self.env,
             testpaths=self.package_paths(ns_name("test-path")),
             testargs=self.config.settings.get("mxmake-test-runner-args", ""),
         )
 
-    def package_paths(self, attr: str) -> typing.List[str]:
+    def package_paths(self, attr: str) -> list[str]:
         paths = list()
         for name, package in self.config.packages.items():
             if attr not in package:
@@ -192,7 +192,7 @@ class CoverageScript(TestScript):
     description: str = "Run coverage"
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         variables = super().template_variables
         variables["sourcepaths"] = self.package_paths(ns_name("source-path"))
         variables["omitpaths"] = self.package_paths(ns_name("omit-path"))
@@ -215,7 +215,7 @@ def target_folder(self) -> Path:
         return mxmake_files()
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         return dict(
             find_links=[
                 link.strip()
@@ -240,17 +240,17 @@ class Makefile(Template):
     def __init__(
         self,
         target_folder: Path,
-        domains: typing.List[Domain],
-        domain_settings: typing.Dict[str, str],
-        environment: typing.Union[Environment, None] = None,
+        domains: list[Domain],
+        domain_settings: dict[str, str],
+        environment: Environment | None = None,
     ) -> None:
         super().__init__(environment)
         self.target_folder = target_folder
         self.domains = domains
         self.domain_settings = domain_settings
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         # collect domain settings
         settings = []
         for domain in self.domains:
@@ -301,8 +301,8 @@ class AdditionalSourcesTargets(Template):
 
     def __init__(
         self,
-        additional_sources_targets: typing.List[str],
-        environment: typing.Union[Environment, None] = None,
+        additional_sources_targets: list[str],
+        environment: Environment | None = None,
     ) -> None:
         super().__init__(environment)
         self.additional_sources_targets = additional_sources_targets
@@ -312,7 +312,7 @@ def target_folder(self) -> Path:
         return mxmake_files()
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         return dict(additional_sources_targets=self.additional_sources_targets)
 
 
@@ -331,15 +331,15 @@ class MxIni(Template):
     def __init__(
         self,
         target_folder: Path,
-        domains: typing.List[Domain],
-        environment: typing.Union[Environment, None] = None,
+        domains: list[Domain],
+        environment: Environment | None = None,
     ) -> None:
         super().__init__(environment)
         self.target_folder = target_folder
         self.domains = domains
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         mxmake_templates = []
         mxmake_env = False
         for domain in self.domains:
@@ -375,7 +375,7 @@ class Topics(Template):
     target_folder = Path()
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         topics = load_topics()
         return {"topics": topics}
 
@@ -404,7 +404,7 @@ class Dependencies(Template):
     target_folder = Path()
 
     @property
-    def template_variables(self) -> typing.Dict[str, typing.Any]:
+    def template_variables(self) -> dict[str, typing.Any]:
         topics = load_topics()
         return {"topics": topics}
 
@@ -426,12 +426,12 @@ def write(self) -> None:
 
 
 class ci_template:
-    templates: typing.List = list()
+    templates: list = list()
 
     def __init__(self, name: str) -> None:
         self.name = name
 
-    def __call__(self, ob: typing.Type["Template"]) -> typing.Type["Template"]:
+    def __call__(self, ob: type["Template"]) -> type["Template"]:
         template(self.name)(ob)
         self.templates.append(self.name)
         return ob

src/mxmake/templates/gh-actions-lint.yml

@@ -15,8 +15,8 @@ jobs:
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
 
-      - name: Set up Python 3.9
-        run: uv python install 3.9
+      - name: Set up Python 3.10
+        run: uv python install 3.10
 
       - name: Install Project
         run: make install