#127: Reformatted code with latest PTB (#128)

tomuben · web-flow · commit e567e131396c · 2025-06-03T09:37:22.000+02:00
fixes #127
diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md
@@ -3,3 +3,4 @@
 ## Refactorings
 
  - #125: Updated exaslct and added check for password leak
+ - #127: Reformatted code with latest PTB
diff --git a/exasol/slc_ci_setup/version.py b/exasol/slc_ci_setup/version.py
@@ -1,7 +1,7 @@
 # ATTENTION:
 # This file is generated by exasol/toolbox/nox/_package_version.py when using:
 #   * either "poetry run -- nox -s project:fix"
-#   * or "poetry run -- nox version:check -- <path/version.py> --fix"
+#   * or "poetry run -- nox version:check -- --fix"
 # Do not edit this file manually!
 # If you need to change the version, do so in the pyproject.toml, e.g. by using `poetry version X.Y.Z`.
 MAJOR = 2
diff --git a/exasol_script_languages_container_ci_setup/cli/commands/generate_buildspec.py b/exasol_script_languages_container_ci_setup/cli/commands/generate_buildspec.py
@@ -39,7 +39,7 @@
     help="Configuration file for build (project specific).",
 )
 def generate_buildspecs(
-    flavor_root_path: Tuple[str, ...],
+    flavor_root_path: tuple[str, ...],
     log_level: str,
     output_path: str,
     config_file: Optional[str],
diff --git a/exasol_script_languages_container_ci_setup/cli/commands/generate_release_buildspec.py b/exasol_script_languages_container_ci_setup/cli/commands/generate_release_buildspec.py
@@ -38,7 +38,7 @@
     help="Configuration file for build (project specific).",
 )
 def generate_release_buildspecs(
-    flavor_root_path: Tuple[str, ...],
+    flavor_root_path: tuple[str, ...],
     log_level: str,
     output_path: str,
     config_file: Optional[str],
diff --git a/exasol_script_languages_container_ci_setup/health_check.py b/exasol_script_languages_container_ci_setup/health_check.py
@@ -6,8 +6,8 @@
 import shlex
 import subprocess
 import sys
+from collections.abc import Iterator
 from typing import (
-    Iterator,
     Optional,
 )
 
diff --git a/exasol_script_languages_container_ci_setup/lib/aws/aws_access.py b/exasol_script_languages_container_ci_setup/lib/aws/aws_access.py
@@ -1,9 +1,9 @@
 import logging
 import time
+from collections.abc import Iterable
 from typing import (
     Callable,
     Dict,
-    Iterable,
     List,
     Optional,
 )
@@ -127,7 +127,7 @@ def validate_cloudformation_template(self, cloudformation_yml) -> None:
         client = self._get_aws_client().create_cloudformation_service()
         client.validate_template(template_body=cloudformation_yml)
 
-    def get_all_stack_resources(self, stack_name: str) -> List[StackResourceSummary]:
+    def get_all_stack_resources(self, stack_name: str) -> list[StackResourceSummary]:
         """
         This functions uses Boto3 to get all AWS Cloudformation resources for a specific Cloudformation stack,
         identified by parameter `stack_name`.
@@ -152,7 +152,7 @@ def get_all_stack_resources(self, stack_name: str) -> List[StackResourceSummary]
     def start_codebuild(
         self,
         project: PhysicalResourceId,
-        environment_variables_overrides: List[Dict[str, str]],
+        environment_variables_overrides: list[dict[str, str]],
         branch: str,
         timeout_in_seconds: int,
         poll_interval_seconds: int = 30,
diff --git a/exasol_script_languages_container_ci_setup/lib/aws/wrapper/cloudformation_service.py b/exasol_script_languages_container_ci_setup/lib/aws/wrapper/cloudformation_service.py
@@ -27,7 +27,7 @@ def validate_template(
         self,
         template_body: str,
         from_boto: Callable[
-            [Dict[str, Any]], ValidationResult
+            [dict[str, Any]], ValidationResult
         ] = ValidationResult.from_boto,
     ) -> ValidationResult:
         boto_validation_result = self._internal_aws_client.validate_template(
@@ -41,7 +41,7 @@ def list_stack_resources(
         stack_name: PhysicalResourceId,
         next_token: Optional[NextToken] = None,
         from_boto: Callable[
-            [Dict[str, Any]], ListStackResourcesResult
+            [dict[str, Any]], ListStackResourcesResult
         ] = ListStackResourcesResult.from_boto,
     ) -> ListStackResourcesResult:
         if next_token is not None:
diff --git a/exasol_script_languages_container_ci_setup/lib/aws/wrapper/codebuild_service.py b/exasol_script_languages_container_ci_setup/lib/aws/wrapper/codebuild_service.py
@@ -25,8 +25,8 @@ def start_build_batch(
         self,
         project_name: PhysicalResourceId,
         source_version: str,
-        environment_variables_override: List[Dict[str, str]],
-        from_boto: Callable[[Dict[str, Any]], BuildBatch] = BuildBatch.from_boto,
+        environment_variables_override: list[dict[str, str]],
+        from_boto: Callable[[dict[str, Any]], BuildBatch] = BuildBatch.from_boto,
     ) -> BuildBatch:
         boto_build_batch = self._internal_aws_client.start_build_batch(
             projectName=project_name.aws_physical_resource_id,
@@ -38,9 +38,9 @@ def start_build_batch(
 
     def batch_get_build_batches(
         self,
-        build_batch_ids: List[PhysicalResourceId],
-        from_boto: Callable[[Dict[str, Any]], BuildBatch] = BuildBatch.from_boto,
-    ) -> List[BuildBatch]:
+        build_batch_ids: list[PhysicalResourceId],
+        from_boto: Callable[[dict[str, Any]], BuildBatch] = BuildBatch.from_boto,
+    ) -> list[BuildBatch]:
         aws_ids = [
             build_batch_id.aws_physical_resource_id
             for build_batch_id in build_batch_ids
diff --git a/exasol_script_languages_container_ci_setup/lib/aws/wrapper/datamodels/cloudformation.py b/exasol_script_languages_container_ci_setup/lib/aws/wrapper/datamodels/cloudformation.py
@@ -31,7 +31,7 @@ class StackResourceSummary:
 
     @classmethod
     def from_boto(
-        cls, boto_stack_resource_summary: Dict[str, Any]
+        cls, boto_stack_resource_summary: dict[str, Any]
     ) -> "StackResourceSummary":
         physical_resource_id = cls._extract_physcial_resource_id(
             boto_stack_resource_summary
@@ -44,7 +44,7 @@ def from_boto(
 
     @classmethod
     def _extract_physcial_resource_id(
-        cls, boto_stack_resource_summary: Dict[str, Any]
+        cls, boto_stack_resource_summary: dict[str, Any]
     ) -> PhysicalResourceId:
         physical_resource_id = None
         if cls._has_physical_resource_id(boto_stack_resource_summary):
@@ -56,7 +56,7 @@ def _extract_physcial_resource_id(
         return physical_resource_id
 
     @classmethod
-    def _has_physical_resource_id(cls, boto_stack_resource_summary: Dict[str, Any]):
+    def _has_physical_resource_id(cls, boto_stack_resource_summary: dict[str, Any]):
         return (
             PHYSICAL_RESOURCE_ID in boto_stack_resource_summary
             and boto_stack_resource_summary[PHYSICAL_RESOURCE_ID] is not None
@@ -66,11 +66,11 @@ def _has_physical_resource_id(cls, boto_stack_resource_summary: Dict[str, Any]):
 @dataclasses.dataclass(frozen=True)
 class ListStackResourcesResult:
     next_token: Optional[NextToken]
-    stack_resource_summaries: List[StackResourceSummary]
+    stack_resource_summaries: list[StackResourceSummary]
 
     @classmethod
     def from_boto(
-        cls, boto_list_stack_resources_result: Dict[str, Any]
+        cls, boto_list_stack_resources_result: dict[str, Any]
     ) -> "ListStackResourcesResult":
         next_token = None
         if cls._has_next_token(boto_list_stack_resources_result):
@@ -97,5 +97,5 @@ def _has_next_token(cls, boto_list_stack_resources_result):
 class ValidationResult:
 
     @classmethod
-    def from_boto(cls, boto_validation_result: Dict[str, Any]) -> "ValidationResult":
+    def from_boto(cls, boto_validation_result: dict[str, Any]) -> "ValidationResult":
         return ValidationResult()
diff --git a/exasol_script_languages_container_ci_setup/lib/aws/wrapper/datamodels/codebuild.py b/exasol_script_languages_container_ci_setup/lib/aws/wrapper/datamodels/codebuild.py
@@ -33,36 +33,36 @@ class BuildBatch:
     build_batch_status: Optional[BuildBatchStatus]
 
     @classmethod
-    def from_boto(self, boto_buildbatch: Dict[str, Any]) -> "BuildBatch":
+    def from_boto(self, boto_buildbatch: dict[str, Any]) -> "BuildBatch":
         batch_id = self._extract_build_id(boto_buildbatch)
         build_batch_status = self._extract_build_batch_status(boto_buildbatch)
         build_batch = BuildBatch(id=batch_id, build_batch_status=build_batch_status)
         return build_batch
 
     @classmethod
     def _extract_build_id(
-        cls, boto_buildbatch: Dict[str, Any]
+        cls, boto_buildbatch: dict[str, Any]
     ) -> Optional[PhysicalResourceId]:
         batch_id = None
         if BuildBatch._has_id(boto_buildbatch):
             batch_id = PhysicalResourceId(aws_physical_resource_id=boto_buildbatch[ID])
         return batch_id
 
     @classmethod
-    def _has_id(cls, boto_buildbatch: Dict[str, Any]) -> bool:
+    def _has_id(cls, boto_buildbatch: dict[str, Any]) -> bool:
         return ID in boto_buildbatch and boto_buildbatch[ID] is not None
 
     @classmethod
     def _extract_build_batch_status(
-        cls, boto_buildbatch: Dict[str, Any]
+        cls, boto_buildbatch: dict[str, Any]
     ) -> Optional[BuildBatchStatus]:
         build_batch_status = None
         if BuildBatch._has_build_status(boto_buildbatch):
             build_batch_status = BuildBatchStatus[boto_buildbatch[BUILD_BATCH_STATUS]]
         return build_batch_status
 
     @classmethod
-    def _has_build_status(cls, boto_buildbatch: Dict[str, Any]) -> bool:
+    def _has_build_status(cls, boto_buildbatch: dict[str, Any]) -> bool:
         return (
             BUILD_BATCH_STATUS in boto_buildbatch
             and boto_buildbatch[BUILD_BATCH_STATUS] is not None
diff --git a/exasol_script_languages_container_ci_setup/lib/aws/wrapper/datamodels/secretsmanager.py b/exasol_script_languages_container_ci_setup/lib/aws/wrapper/datamodels/secretsmanager.py
@@ -16,7 +16,7 @@ class Secret:
     arn: ARN
 
     @classmethod
-    def from_boto(cls, boto_secret: Dict[str, Any]) -> "Secret":
+    def from_boto(cls, boto_secret: dict[str, Any]) -> "Secret":
         aws_arn = boto_secret[ARN_KEY]
         if aws_arn is None:
             raise ValueError("ARN was None")
diff --git a/exasol_script_languages_container_ci_setup/lib/aws/wrapper/secretsmanager_service.py b/exasol_script_languages_container_ci_setup/lib/aws/wrapper/secretsmanager_service.py
@@ -25,7 +25,7 @@ def internal_aws_client(self) -> Any:
     def get_secret_value(
         self,
         secret_id: PhysicalResourceId,
-        from_boto: Callable[[Dict[str, Any]], Secret] = Secret.from_boto,
+        from_boto: Callable[[dict[str, Any]], Secret] = Secret.from_boto,
     ) -> Secret:
         boto_secret = self._internal_aws_client.get_secret_value(
             SecretId=secret_id.aws_physical_resource_id
diff --git a/exasol_script_languages_container_ci_setup/lib/generate_buildspec_common.py b/exasol_script_languages_container_ci_setup/lib/generate_buildspec_common.py
@@ -50,7 +50,7 @@ def get_config_file_parameter(config_file: Optional[str]):
     return f"--config-file {config_file}"
 
 
-def _find_flavors(flavor_root_paths: Tuple[str, ...]) -> List[Flavor]:
+def _find_flavors(flavor_root_paths: tuple[str, ...]) -> list[Flavor]:
     """
     Find flavors under the given path(s) and return them in ordered list.
     """
@@ -68,7 +68,7 @@ def _find_flavors(flavor_root_paths: Tuple[str, ...]) -> List[Flavor]:
 
 
 def write_batch_build_spec(
-    flavor_root_paths: Tuple[str, ...], output_pathname: str
+    flavor_root_paths: tuple[str, ...], output_pathname: str
 ) -> None:
     buildspec_body = []
     flavors = _find_flavors(flavor_root_paths)
diff --git a/exasol_script_languages_container_ci_setup/lib/run_generate_buildspec.py b/exasol_script_languages_container_ci_setup/lib/run_generate_buildspec.py
@@ -16,7 +16,7 @@
 
 
 def run_generate_buildspec(
-    flavor_root_paths: Tuple[str, ...], output_pathname: str, config_file: Optional[str]
+    flavor_root_paths: tuple[str, ...], output_pathname: str, config_file: Optional[str]
 ):
     validate_config_file(config_file)
 
diff --git a/exasol_script_languages_container_ci_setup/lib/run_generate_release_buildspec.py b/exasol_script_languages_container_ci_setup/lib/run_generate_release_buildspec.py
@@ -16,7 +16,7 @@
 
 
 def run_generate_release_buildspec(
-    flavor_root_paths: Tuple[str, ...], output_pathname: str, config_file: Optional[str]
+    flavor_root_paths: tuple[str, ...], output_pathname: str, config_file: Optional[str]
 ):
     validate_config_file(config_file)
     logging.info(f"Run run_generate_release_buildspec for paths: {flavor_root_paths}")
diff --git a/exasol_script_languages_container_ci_setup/lib/run_start_build.py b/exasol_script_languages_container_ci_setup/lib/run_start_build.py
@@ -25,12 +25,12 @@
 DEFAULT_TIMEOUT = 3 * 60 * 60  # 3 hours
 
 
-def get_environment_variable_override(env_variable: Tuple[str, str]) -> Dict[str, str]:
+def get_environment_variable_override(env_variable: tuple[str, str]) -> dict[str, str]:
     return {"name": env_variable[0], "value": env_variable[1], "type": "PLAINTEXT"}
 
 
 def get_aws_codebuild_project(
-    resources: List[StackResourceSummary], project: str
+    resources: list[StackResourceSummary], project: str
 ) -> StackResourceSummary:
     matching_project = [
         resource
diff --git a/flavors/integration_test/flavor_base/build_steps.py b/flavors/integration_test/flavor_base/build_steps.py
@@ -13,7 +13,7 @@ def get_build_step(self) -> str:
     def requires_tasks(self):
         return {}
 
-    def get_additional_build_directories_mapping(self) -> Dict[str, str]:
+    def get_additional_build_directories_mapping(self) -> dict[str, str]:
         return {}
 
     def get_path_in_flavor(self):
diff --git a/noxconfig.py b/noxconfig.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Iterable
 
 
 @dataclass(frozen=True)
diff --git a/test/contract_tests/aws_access/code_build_service.py b/test/contract_tests/aws_access/code_build_service.py
@@ -33,7 +33,7 @@ def source_version(self) -> str:
         raise NotImplementedError()
 
     @pytest.fixture(scope="class")
-    def environment_variables_override(self) -> List[Dict[str, str]]:
+    def environment_variables_override(self) -> list[dict[str, str]]:
         raise NotImplementedError()
 
     @pytest.fixture(scope="class")
@@ -70,7 +70,7 @@ def source_version(self) -> str:
         raise NotImplementedError()
 
     @pytest.fixture(scope="class")
-    def environment_variables_override(self) -> List[Dict[str, str]]:
+    def environment_variables_override(self) -> list[dict[str, str]]:
         raise NotImplementedError()
 
     @pytest.fixture(scope="class")
@@ -80,7 +80,7 @@ def build_batches(
         project_name,
         source_version,
         environment_variables_override,
-    ) -> Tuple[BuildBatch, BuildBatch]:
+    ) -> tuple[BuildBatch, BuildBatch]:
         build_batch_from_start = codebuild_service.start_build_batch(
             project_name=project_name,
             source_version=source_version,
@@ -112,7 +112,7 @@ def build_batch_id(self, codebuild_service) -> PhysicalResourceId:
         raise NotImplementedError()
 
     @pytest.fixture(scope="class")
-    def build_batches(self, codebuild_service, build_batch_id) -> List[BuildBatch]:
+    def build_batches(self, codebuild_service, build_batch_id) -> list[BuildBatch]:
         build_batches = codebuild_service.batch_get_build_batches(
             build_batch_ids=[build_batch_id]
         )
diff --git a/test/unit/aws/test_aws_access_start_code_build.py b/test/unit/aws/test_aws_access_start_code_build.py
@@ -40,7 +40,7 @@
 
 
 class TestSetup:
-    def __init__(self, batch_get_build_batches_return_values: List[List[BuildBatch]]):
+    def __init__(self, batch_get_build_batches_return_values: list[list[BuildBatch]]):
         self.batch_get_build_batches_return_values = (
             batch_get_build_batches_return_values
         )
@@ -103,7 +103,7 @@ def _create_environment_variables_overrides(self):
 
 
 def create_batch_get_build_batches_return_values_for_success() -> (
-    List[List[BuildBatch]]
+    list[list[BuildBatch]]
 ):
     batch_get_build_batches_return_values = [
         [BuildBatch(build_batch_status=BuildBatchStatus.IN_PROGRESS, id=None)],
@@ -147,7 +147,7 @@ def test_success_sleep_function_mock_call():
 
 
 def create_batch_get_build_batches_return_values_for_timeout() -> (
-    List[List[BuildBatch]]
+    list[list[BuildBatch]]
 ):
     batch_get_build_batches_return_values = [
         [BuildBatch(build_batch_status=BuildBatchStatus.IN_PROGRESS, id=None)]

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@`
`3`	`3`	`## Refactorings`
`4`	`4`
`5`	`5`	`- #125: Updated exaslct and added check for password leak`
	`6`	`+ - #127: Reformatted code with latest PTB`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`help="Configuration file for build (project specific).",`
`40`	`40`	`)`
`41`	`41`	`def generate_buildspecs(`
`42`		`- flavor_root_path: Tuple[str, ...],`
	`42`	`+ flavor_root_path: tuple[str, ...],`
`43`	`43`	`log_level: str,`
`44`	`44`	`output_path: str,`
`45`	`45`	`config_file: Optional[str],`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`help="Configuration file for build (project specific).",`
`39`	`39`	`)`
`40`	`40`	`def generate_release_buildspecs(`
`41`		`- flavor_root_path: Tuple[str, ...],`
	`41`	`+ flavor_root_path: tuple[str, ...],`
`42`	`42`	`log_level: str,`
`43`	`43`	`output_path: str,`
`44`	`44`	`config_file: Optional[str],`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`import shlex`
`7`	`7`	`import subprocess`
`8`	`8`	`import sys`
	`9`	`+from collections.abc import Iterator`
`9`	`10`	`from typing import (`
`10`		`- Iterator,`
`11`	`11`	`Optional,`
`12`	`12`	`)`
`13`	`13`