Add pyupgrade_argument to BaseConfig and use in pyupgrade command

Author: ArBridgeman

exasol/toolbox/config.py

@@ -61,3 +61,16 @@ def minimum_python_version(self) -> str:
         costly to run the tests for all `python_versions` or we need a single metric.
         """
         return str(min([Version.from_string(v) for v in self.python_versions]))
+
+    @computed_field  # type: ignore[misc]
+    @property
+    def pyupgrade_argument(self) -> tuple[str, ...]:
+        """
+        Default argument to :func:`exasol.toolbox._format._pyupgrade`.
+
+        It uses the minimum Python version to ensure compatibility with all supported
+        versions of a project.
+        """
+        version_parts = self.minimum_python_version.split(".")[:2]
+        version_number = "".join(version_parts)
+        return (f"--py{version_number}-plus",)

exasol/toolbox/nox/_format.py

@@ -8,15 +8,14 @@
 from exasol.toolbox.nox._shared import (
     Mode,
     _version,
+    check_for_config_attribute,
     python_files,
 )
 from noxconfig import (
     PROJECT_CONFIG,
     Config,
 )
 
-_PYUPGRADE_ARGS = ("--py39-plus",)
-
 
 def _code_format(session: Session, mode: Mode, files: Iterable[str]) -> None:
     def command(*args: str) -> Iterable[str]:
@@ -27,10 +26,10 @@ def command(*args: str) -> Iterable[str]:
 
 
 def _pyupgrade(session: Session, config: Config, files: Iterable[str]) -> None:
-    pyupgrade_args = getattr(config, "pyupgrade_args", _PYUPGRADE_ARGS)
+    check_for_config_attribute(config, "pyupgrade_argument")
     session.run(
         "pyupgrade",
-        *pyupgrade_args,
+        *config.pyupgrade_argument,
         "--exit-zero-even-if-changed",
         *files,
     )

noxconfig.py

@@ -63,10 +63,6 @@ class Config(BaseConfig):
         ".github",
     )
     plugins: Iterable[object] = (UpdateTemplates,)
-    # need --keep-runtime-typing, as pydantic with python3.9 does not accept str | None
-    # format, and it is not resolved with from __future__ import annotations. pyupgrade
-    # will keep switching Optional[str] to str | None leading to issues.
-    pyupgrade_args: Iterable[str] = ("--py39-plus", "--keep-runtime-typing")
 
 
 PROJECT_CONFIG = Config(

project-template/{{cookiecutter.repo_name}}/noxconfig.py

@@ -17,8 +17,6 @@ class Config(BaseConfig):
             / "version.py"
     )
     path_filters: Iterable[str] = ()
-    pyupgrade_args: Iterable[str] = (
-    "--py{{cookiecutter.python_version_min | replace('.', '')}}-plus",)
     plugins: Iterable[object] = ()
 
 PROJECT_CONFIG = Config()

test/unit/config_test.py

@@ -57,6 +57,12 @@ def test_expansion_validation_fails_for_invalid_version():
         BaseConfigExpansion(python_versions=("1.f.0",))
 
 
-def test_min_py_version():
+def test_minimum_python_version():
     conf = BaseConfig(python_versions=("5.5.5", "1.1.1", "9.9.9"))
     assert conf.minimum_python_version == "1.1.1"
+
+
+@pytest.mark.parametrize("minimum_python_version", ["3.10", "3.10.5"])
+def test_pyupgrade_argument(minimum_python_version):
+    conf = BaseConfig(python_versions=("3.11", minimum_python_version, "3.12"))
+    assert conf.pyupgrade_argument == ("--py310-plus",)