Update to pyupgrades to 3.9 but skip typing changes as incorrectly putting Optional[str], etc. to str | None for python3.9

* afaics there is not an inline skip message

Author: ArBridgeman

exasol/toolbox/nox/_format.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Iterable
+from collections.abc import Iterable
 
 import nox
 from nox import Session
@@ -26,7 +26,8 @@ def _pyupgrade(session: Session, files: Iterable[str]) -> None:
         "poetry",
         "run",
         "pyupgrade",
-        "--py38-plus",
+        "--py39-plus",
+        "--keep-runtime-typing",
         "--exit-zero-even-if-changed",
         *files,
     )

exasol/toolbox/nox/_lint.py

@@ -2,12 +2,8 @@
 
 import argparse
 import sys
+from collections.abc import Iterable
 from pathlib import Path
-from typing import (
-    Dict,
-    Iterable,
-    List,
-)
 
 import nox
 import rich.console

exasol/toolbox/tools/security.py

@@ -18,6 +18,7 @@
 from functools import partial
 from inspect import cleandoc
 from pathlib import Path
+from typing import Optional
 
 import typer
 
@@ -269,7 +270,9 @@ def as_markdown_listing(elements: Iterable[str]):
     )
 
 
-def create_security_issue(issue: Issue, project: str | None = None) -> tuple[str, str]:
+def create_security_issue(
+    issue: Issue, project: Optional[str] = None
+) -> tuple[str, str]:
     # fmt: off
     command = [
         "gh", "issue", "create",

exasol/toolbox/util/dependencies/licenses.py

@@ -4,6 +4,7 @@
 import tempfile
 from inspect import cleandoc
 from json import loads
+from typing import Optional
 
 from pydantic import field_validator
 
@@ -38,21 +39,21 @@
 
 
 class PackageLicense(Package):
-    package_link: str | None
+    package_link: Optional[str]
     license: str
 
     @field_validator("package_link", mode="before")
-    def map_unknown_to_none(cls, v) -> str | None:
+    def map_unknown_to_none(cls, v) -> Optional[str]:
         if v == "UNKNOWN":
             return None
         return v
 
     @field_validator("license", mode="before")
-    def map_to_normalized_values(cls, v) -> str | None:
+    def map_to_normalized_values(cls, v) -> Optional[str]:
         return _normalize(v)
 
     @property
-    def license_link(self) -> str | None:
+    def license_link(self) -> Optional[str]:
         return LICENSE_MAPPING_TO_URL.get(self.license, None)
 
 

exasol/toolbox/util/dependencies/poetry_dependencies.py

@@ -17,16 +17,19 @@
 
 class PoetryGroup(BaseModel):
     name: str
-    toml_section: str
+    toml_section: Optional[str]
 
     class Config:
         frozen = True
 
 
+TRANSITIVE_GROUP = PoetryGroup(name="transitive", toml_section=None)
+
+
 class PoetryDependency(Package):
     name: str
     version: str
-    group: PoetryGroup | None
+    group: PoetryGroup
 
 
 class PoetryToml(BaseModel):
@@ -45,12 +48,12 @@ def read_content(cls, values):
             raise ValueError(f"Error reading file: {str(e)}")
         return values
 
-    def get_section_dict(self, section: str) -> dict | None:
+    def get_section_dict(self, section: str) -> Optional[dict]:
         current = self._content.copy()
         for section in section.split("."):
             if section not in current:
                 return None
-            current = current[section]
+            current = current[section]  # type: ignore
         return current
 
     @property
@@ -83,13 +86,13 @@ class PoetryDependencies(BaseModel):
     working_directory: Path
 
     @staticmethod
-    def _extract_from_line(line: str, group: PoetryGroup | None) -> PoetryDependency:
+    def _extract_from_line(line: str, group: PoetryGroup) -> PoetryDependency:
         pattern = r"\s+(\d+(?:\.\d+)*)\s+"
         match = re.split(pattern, line)
         return PoetryDependency(name=match[0], version=match[1], group=group)
 
     def _extract_from_poetry_show(
-        self, output_text: str, group: PoetryGroup | None
+        self, output_text: str, group: PoetryGroup
     ) -> list[PoetryDependency]:
         return [
             self._extract_from_line(line, group=group)
@@ -125,8 +128,8 @@ def all_dependencies(self) -> dict[str, list[PoetryDependency]]:
             for dep in group_list
         }
         for line in output.stdout.splitlines():
-            dep = self._extract_from_line(line=line, group=None)
+            dep = self._extract_from_line(line=line, group=TRANSITIVE_GROUP)
             if dep.name not in names_direct_dependencies:
                 transitive_dependencies.append(dep)
 
-        return direct_dependencies | {"transitive": transitive_dependencies}
+        return direct_dependencies | {TRANSITIVE_GROUP.name: transitive_dependencies}