Run project:fix on files with pyupgrade change

Author: ArBridgeman

exasol/toolbox/metrics.py

@@ -4,6 +4,7 @@
 import subprocess
 import sys
 from collections import defaultdict
+from collections.abc import Callable
 from dataclasses import (
     asdict,
     dataclass,
@@ -18,7 +19,6 @@
 from tempfile import TemporaryDirectory
 from typing import (
     Any,
-    Callable,
     Dict,
     List,
     Optional,
@@ -101,7 +101,7 @@ class Report:
     technical_debt: Rating
 
 
-def total_coverage(file: Union[str, Path]) -> float:
+def total_coverage(file: str | Path) -> float:
     with TemporaryDirectory() as tmpdir:
         tmp_dir = Path(tmpdir)
         report = tmp_dir / "coverage.json"
@@ -133,8 +133,8 @@ def total_coverage(file: Union[str, Path]) -> float:
         return total
 
 
-def _static_code_analysis(file: Union[str, Path]) -> Rating:
-    def pylint(f: Union[str, Path]) -> Rating:
+def _static_code_analysis(file: str | Path) -> Rating:
+    def pylint(f: str | Path) -> Rating:
         expr = re.compile(r"^Your code has been rated at (\d+.\d+)/.*", re.MULTILINE)
         with open(f, encoding="utf-8") as results:
             data = results.read()
@@ -154,15 +154,15 @@ def pylint(f: Union[str, Path]) -> Rating:
     return pylint_score
 
 
-def maintainability(file: Union[str, Path]) -> Rating:
+def maintainability(file: str | Path) -> Rating:
     return _static_code_analysis(file)
 
 
 def reliability() -> Rating:
     return Rating.NotAvailable
 
 
-def security(file: Union[str, Path]) -> Rating:
+def security(file: str | Path) -> Rating:
     with open(file) as json_file:
         security_lint = json.load(json_file)
     return Rating.bandit_rating(_bandit_scoring(security_lint["results"]))
@@ -198,10 +198,10 @@ def technical_debt() -> Rating:
 
 def create_report(
     commit: str,
-    date: Optional[datetime.datetime] = None,
-    coverage_report: Union[str, Path] = ".coverage",
-    pylint_report: Union[str, Path] = ".lint.txt",
-    bandit_report: Union[str, Path] = ".security.json",
+    date: datetime.datetime | None = None,
+    coverage_report: str | Path = ".coverage",
+    pylint_report: str | Path = ".lint.txt",
+    bandit_report: str | Path = ".security.json",
 ) -> Report:
     return Report(
         commit=commit,
@@ -254,7 +254,7 @@ def _rating_color(value: Rating) -> str:
 
 @color.register(float)
 @color.register(int)
-def _coverage_color(value: Union[float, int]) -> str:
+def _coverage_color(value: float | int) -> str:
     if 0 <= value < 20:
         return _rating_color(Rating.F)
     elif 20 <= value < 50:

exasol/toolbox/nox/_artifacts.py

@@ -185,7 +185,7 @@ def _copy_artifacts(source: Path, dest: Path, files: Iterable[str]):
 
 
 def _prepare_coverage_xml(
-    session: Session, source: Path, cwd: Optional[Path] = None
+    session: Session, source: Path, cwd: Path | None = None
 ) -> None:
     """
     Prepare the coverage XML for input into Sonar
@@ -225,9 +225,7 @@ def _prepare_coverage_xml(
         session.error(output.returncode, output.stdout, output.stderr)
 
 
-def _upload_to_sonar(
-    session: Session, sonar_token: Optional[str], config: Config
-) -> None:
+def _upload_to_sonar(session: Session, sonar_token: str | None, config: Config) -> None:
     command = [
         "pysonar",
         "--sonar-token",

exasol/toolbox/tools/replace_version.py

@@ -1,9 +1,9 @@
 import re
+from collections.abc import Callable
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
 from typing import (
-    Callable,
     Optional,
 )
 
@@ -54,7 +54,7 @@ def __init__(
         self.pattern = pattern
         self.version_string_modifier = version_string_modifier
 
-    def replace_version(self, line: str, version: Version) -> Optional[str]:
+    def replace_version(self, line: str, version: Version) -> str | None:
         match = re.search(self.pattern.full_pattern, line)
         if match:
             return self.pattern.replace_version(

exasol/toolbox/tools/security.py

@@ -276,9 +276,7 @@ def as_markdown_listing(elements: Iterable[str]):
     )
 
 
-def create_security_issue(
-    issue: Issue, project: Optional[str] = None
-) -> tuple[str, str]:
+def create_security_issue(issue: Issue, project: str | None = None) -> tuple[str, str]:
     # fmt: off
     command = [
         "gh", "issue", "create",

exasol/toolbox/tools/template.py

@@ -86,8 +86,8 @@ def diff_template(template: str, dest: Path, pkg: str, template_type: str) -> No
 
 def _install_template(
     template_type: str,
-    src: Union[str, Path],
-    dest: Union[str, Path],
+    src: str | Path,
+    dest: str | Path,
     exists_ok: bool = False,
 ) -> None:
     src, dest = Path(src), Path(dest)

exasol/toolbox/util/dependencies/audit.py

@@ -55,7 +55,7 @@ def from_audit_entry(
         )
 
     @property
-    def security_issue_entry(self) -> dict[str, Union[str, list[str]]]:
+    def security_issue_entry(self) -> dict[str, str | list[str]]:
         return {
             "name": self.name,
             "version": str(self.version),
@@ -141,7 +141,7 @@ def load_from_pip_audit(cls, working_directory: Path) -> Vulnerabilities:
         return Vulnerabilities(vulnerabilities=vulnerabilities)
 
     @property
-    def security_issue_dict(self) -> list[dict[str, Union[str, list[str]]]]:
+    def security_issue_dict(self) -> list[dict[str, str | list[str]]]:
         return [
             vulnerability.security_issue_entry for vulnerability in self.vulnerabilities
         ]

exasol/toolbox/util/dependencies/licenses.py

@@ -41,21 +41,21 @@
 
 
 class PackageLicense(Package):
-    package_link: Optional[str]
+    package_link: str | None
     license: str
 
     @field_validator("package_link", mode="before")
-    def map_unknown_to_none(cls, v) -> Optional[str]:
+    def map_unknown_to_none(cls, v) -> str | None:
         if v == "UNKNOWN":
             return None
         return v
 
     @field_validator("license", mode="before")
-    def map_to_normalized_values(cls, v) -> Optional[str]:
+    def map_to_normalized_values(cls, v) -> str | None:
         return _normalize(v)
 
     @property
-    def license_link(self) -> Optional[str]:
+    def license_link(self) -> str | None:
         return LICENSE_MAPPING_TO_URL.get(self.license, None)
 
 

exasol/toolbox/util/dependencies/poetry_dependencies.py

@@ -25,7 +25,7 @@ class PoetryGroup(BaseModel):
     model_config = ConfigDict(frozen=True)
 
     name: str
-    toml_section: Optional[str]
+    toml_section: str | None
 
 
 PYPROJECT_TOML = "pyproject.toml"
@@ -50,7 +50,7 @@ def load_from_toml(cls, working_directory: Path) -> PoetryToml:
         except Exception as e:
             raise ValueError(f"Error reading file: {str(e)}")
 
-    def get_section_dict(self, section: str) -> Optional[dict]:
+    def get_section_dict(self, section: str) -> dict | None:
         current = self.content.copy()
         for section in section.split("."):
             if section not in current:
@@ -94,7 +94,7 @@ class PoetryDependencies(BaseModel):
     working_directory: Path
 
     @staticmethod
-    def _extract_from_line(line: str) -> Optional[Package]:
+    def _extract_from_line(line: str) -> Package | None:
         # remove (!) from line as indicates not installed in environment,
         # which could occur for optional dependencies
         split_line = line.replace("(!)", "").strip().split(maxsplit=2)

exasol/toolbox/util/dependencies/track_changes.py

@@ -71,7 +71,7 @@ class DependencyChanges(BaseModel):
 
     def _categorize_change(
         self, dependency_name: NormalizedPackageStr
-    ) -> Optional[DependencyChange]:
+    ) -> DependencyChange | None:
         """
         Categorize dependency change as removed, added, or updated.
         """

exasol/toolbox/util/git.py

@@ -27,7 +27,7 @@ def get_latest_tag():
 
     @staticmethod
     @run_command
-    def read_file_from_tag(tag: str, path: Union[Path, str]):
+    def read_file_from_tag(tag: str, path: Path | str):
         """
         Read the contents of the specified file `path` at the point in
         time specified by git tag `tag`.