ruff check fixes

Author: benbz

scripts/spdx_checks.py

@@ -6,11 +6,11 @@
 
 import re
 import sys
+from typing import Annotated
 
 import typer
 from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
-from typing_extensions import Annotated
 
 
 def run_spdx_checks(input_file: Annotated[typer.FileText, typer.Argument()] = sys.stdin):

tests/integration/fixtures/cluster.py

@@ -4,8 +4,9 @@
 
 import asyncio
 import os
+from collections.abc import AsyncGenerator
 from pathlib import Path
-from typing import Any, AsyncGenerator
+from typing import Any
 
 import pyhelm3
 import pytest

tests/manifests/__init__.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 
 import copy
-from typing import Any, Dict
+from typing import Any
 
 _raw_shared_components_details = {
     "initSecrets": {"hyphened_name": "init-secrets", "has_service_monitor": False, "has_ingress": False},
@@ -35,7 +35,7 @@
 }
 
 
-def _enrich_components_to_test(details) -> Dict[str, Any]:
+def _enrich_components_to_test(details) -> dict[str, Any]:
     _component_details = copy.deepcopy(details)
     for component in details:
         _component_details[component].setdefault("hyphened_name", component)

tests/manifests/test_ingresses.py

@@ -240,5 +240,6 @@ async def test_ingress_services(templates):
                 else:
                     port_numbers = [port["port"] for port in found_service["spec"]["ports"]]
                     assert backend_service["port"]["number"] in port_numbers, (
-                        f"Port number {backend_service['port']['number']} not found in service {backend_service['name']}"
+                        f"Port number {backend_service['port']['number']} "
+                        f"not found in service {backend_service['name']}"
                     )

tests/manifests/test_service_monitors.py

@@ -2,26 +2,27 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 
-from typing import Any, Dict, Iterator
+from collections.abc import Iterator
+from typing import Any
 
 import pytest
 
 from . import component_details, shared_components_details, values_files_to_test
 
 
-def selector_match(labels: Dict[str, str], selector: Dict[str, str]) -> bool:
+def selector_match(labels: dict[str, str], selector: dict[str, str]) -> bool:
     return all(labels[key] == value for key, value in selector.items())
 
 
-def find_services_matching_selector(templates: Iterator[Any], selector: Dict[str, str]) -> list[Any]:
+def find_services_matching_selector(templates: Iterator[Any], selector: dict[str, str]) -> list[Any]:
     services = []
     for template in templates:
         if template["kind"] == "Service" and selector_match(template["metadata"]["labels"], selector):
             services.append(template)
     return services
 
 
-def find_workload_ids_matching_selector(templates: Iterator[Any], selector: Dict[str, str]) -> list[str]:
+def find_workload_ids_matching_selector(templates: Iterator[Any], selector: dict[str, str]) -> list[str]:
     workload_ids = []
     for template in templates:
         if template["kind"] in ("Deployment", "StatefulSet", "Job") and selector_match(

tests/manifests/utils.py

@@ -3,8 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 
 import json
+from collections.abc import Iterator
 from pathlib import Path
-from typing import Any, Dict, Iterator
+from typing import Any
 
 import pyhelm3
 import pytest
@@ -29,12 +30,12 @@ def component(values_file):
 
 
 @pytest.fixture(scope="function")
-def values(values_file) -> Dict[str, Any]:
+def values(values_file) -> dict[str, Any]:
     return yaml.safe_load((Path("charts/matrix-stack/ci") / values_file).read_text("utf-8"))
 
 
 @pytest.fixture(scope="function")
-async def templates(chart: pyhelm3.Chart, values: Dict[str, Any]):
+async def templates(chart: pyhelm3.Chart, values: dict[str, Any]):
     return list([template for template in await helm_template(chart, "pytest", values) if template is not None])