Switch Union[*, None] with Optional[*]

Author: ArBridgeman

exasol/toolbox/nox/_artifacts.py

@@ -7,10 +7,7 @@
 import sys
 from collections.abc import Iterable
 from pathlib import Path
-from typing import (
-    Optional,
-    Union,
-)
+from typing import Optional
 
 import nox
 from nox import Session
@@ -188,7 +185,7 @@ def _copy_artifacts(source: Path, dest: Path, files: Iterable[str]):
 
 
 def _prepare_coverage_xml(
-    session: Session, source: Path, cwd: Union[Path, None] = None
+    session: Session, source: Path, cwd: Optional[Path] = None
 ) -> None:
     """
     Prepare the coverage XML for input into Sonar

exasol/toolbox/util/dependencies/track_changes.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-from typing import (
-    Union,
-)
+from typing import Optional
 
 from packaging.version import Version
 from pydantic import (
@@ -73,7 +71,7 @@ class DependencyChanges(BaseModel):
 
     def _categorize_change(
         self, dependency_name: NormalizedPackageStr
-    ) -> Union[DependencyChange, None]:
+    ) -> Optional[DependencyChange]:
         """
         Categorize dependency change as removed, added, or updated.
         """
@@ -84,7 +82,9 @@ def _categorize_change(
         elif not previous_dependency and current_dependency:
             return AddedDependency.from_package(current_dependency)
         elif previous_dependency.version != current_dependency.version:  # type: ignore
-            return UpdatedDependency.from_package(previous_dependency, current_dependency)  # type: ignore
+            return UpdatedDependency.from_package(
+                previous_dependency, current_dependency
+            )  # type: ignore
         # dependency was unchanged between versions
         return None
 

test/integration/project-template/nox_test.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Optional
 
 
 class TestSpecificNoxTasks:
@@ -14,8 +14,10 @@ class TestSpecificNoxTasks:
     both the relationships between nox tasks and ensuring that the project-template
     passes CI tests when a new project is created from it.
     """
+
     @staticmethod
-    def _command(poetry_path: str, task: str, add_ons: Union[list[str], None]=None) -> list[str]:
+    def _command(poetry_path: str, task: str,
+                 add_ons: Optional[list[str]] = None) -> list[str]:
         base = [poetry_path, "run", "--", "nox", "-s", task]
         if add_ons:
             base = base + ["--"] + add_ons
@@ -33,9 +35,10 @@ def test_artifact_validate(self, poetry_path, run_command):
         run_command(lint_code)
         lint_security = self._command(poetry_path, "lint:security")
         run_command(lint_security)
-        test_unit = self._command(poetry_path, "test:unit",["--coverage"])
+        test_unit = self._command(poetry_path, "test:unit", ["--coverage"])
         run_command(test_unit)
-        test_integration = self._command(poetry_path, "test:integration",["--coverage"])
+        test_integration = self._command(poetry_path, "test:integration",
+                                         ["--coverage"])
         run_command(test_integration)
         # `artifacts:copy` is skipped here. This step has the pre-requisite that files
         # were uploaded to & then downloaded from the GitHub run's artifacts.

test/unit/util/dependencies/licenses_test.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Optional
 
 import pytest
 
@@ -167,8 +167,8 @@ def test_format_group_table(package_license_report, dependencies, main_group):
     )
     def test_format_table_row(
         package_license_report,
-        package_link: Union[str, None],
-        license_link: Union[str, None],
+        package_link: Optional[str],
+        license_link: Optional[str],
         expected,
     ):
         _license = PackageLicense(