Update ruff target-version to 3.13 (#13688)

giograno · web-flow · commit 26619a9be885 · 2026-02-04T10:12:16.000+01:00
diff --git a/localstack-core/localstack/aws/connect.py b/localstack-core/localstack/aws/connect.py
@@ -15,7 +15,7 @@
 from functools import lru_cache, partial
 from random import choice
 from socket import socket
-from typing import Any, Generic, TypedDict, TypeVar
+from typing import Any, TypedDict
 
 import dns.message
 import dns.query
@@ -165,10 +165,7 @@ def load_dto(data: str) -> InternalRequestParameters:
     return json.loads(data)
 
 
-T = TypeVar("T")
-
-
-class MetadataRequestInjector(Generic[T]):
+class MetadataRequestInjector[T]:
     def __init__(self, client: T, params: dict[str, str] | None = None):
         self._client = client
         self._params = params
diff --git a/localstack-core/localstack/aws/protocol/routing.py b/localstack-core/localstack/aws/protocol/routing.py
@@ -1,5 +1,4 @@
 import re
-from typing import AnyStr
 
 from werkzeug.routing import Rule
 
@@ -30,7 +29,7 @@ def __init__(self, string: str, method: str, **kwargs) -> None:
         self.methods = {method.upper()}
 
 
-def transform_path_params_to_rule_vars(match: re.Match[AnyStr]) -> str:
+def transform_path_params_to_rule_vars(match: re.Match[str]) -> str:
     """
     Transforms a request URI path param to a valid Werkzeug Rule string variable placeholder.
     This transformation function should be used in combination with _path_param_regex on the request URIs (without any
diff --git a/localstack-core/localstack/aws/spec.py b/localstack-core/localstack/aws/spec.py
@@ -142,7 +142,7 @@ def load_service(
     return ServiceModel(service_description, service)
 
 
-def iterate_service_operations() -> Generator[tuple[ServiceModel, OperationModel], None, None]:
+def iterate_service_operations() -> Generator[tuple[ServiceModel, OperationModel]]:
     """
     Returns one record per operation in the AWS service spec, where the first item is the service model the operation
     belongs to, and the second is the operation model.
diff --git a/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model.py b/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model.py
@@ -4,9 +4,7 @@
 import enum
 from collections.abc import Generator
 from itertools import zip_longest
-from typing import Any, Final, TypedDict, cast
-
-from typing_extensions import TypeVar
+from typing import Any, Final, TypedDict, TypeVar, cast
 
 from localstack.aws.api.cloudformation import ChangeAction
 from localstack.services.cloudformation.resource_provider import ResourceProviderExecutor
diff --git a/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_preproc.py b/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_preproc.py
@@ -4,7 +4,7 @@
 import copy
 import re
 from collections.abc import Callable
-from typing import Any, Final, Generic, TypeVar
+from typing import Any, Final
 
 from botocore.exceptions import ClientError
 
@@ -79,9 +79,6 @@
     "AWS::NotificationARNs",
 }
 
-TBefore = TypeVar("TBefore")
-TAfter = TypeVar("TAfter")
-_T = TypeVar("_T")
 
 REGEX_OUTPUT_APIGATEWAY = re.compile(
     rf"^(https?://.+\.execute-api\.)(?:[^-]+-){{2,3}}\d\.(amazonaws\.com|{_AWS_URL_SUFFIX})/?(.*)$"
@@ -91,7 +88,7 @@
 VALID_LOGICAL_RESOURCE_ID_RE = re.compile(r"^[A-Za-z0-9]+$")
 
 
-class PreprocEntityDelta(Generic[TBefore, TAfter]):
+class PreprocEntityDelta[TBefore, TAfter]:
     before: Maybe[TBefore]
     after: Maybe[TAfter]
 
@@ -432,16 +429,16 @@ def _maybe_perform_static_replacements(self, delta: PreprocEntityDelta) -> Prepr
     def _maybe_perform_dynamic_replacements(self, delta: PreprocEntityDelta) -> PreprocEntityDelta:
         return self._maybe_perform_on_delta(delta, self._perform_dynamic_replacements)
 
-    def _maybe_perform_on_delta(
-        self, delta: PreprocEntityDelta | None, f: Callable[[_T], _T]
+    def _maybe_perform_on_delta[T](
+        self, delta: PreprocEntityDelta | None, f: Callable[[T], T]
     ) -> PreprocEntityDelta | None:
         if isinstance(delta.before, str):
             delta.before = f(delta.before)
         if isinstance(delta.after, str):
             delta.after = f(delta.after)
         return delta
 
-    def _perform_dynamic_replacements(self, value: _T) -> _T:
+    def _perform_dynamic_replacements[T](self, value: T) -> T:
         if not isinstance(value, str):
             return value
 
diff --git a/localstack-core/localstack/services/cloudformation/resource_provider.py b/localstack-core/localstack/services/cloudformation/resource_provider.py
@@ -10,7 +10,7 @@
 from enum import Enum, auto
 from logging import Logger
 from math import ceil
-from typing import TYPE_CHECKING, Any, Generic, TypedDict, TypeVar
+from typing import TYPE_CHECKING, Any, TypedDict, TypeVar
 
 import botocore
 from botocore.client import BaseClient
@@ -65,7 +65,7 @@ class OperationStatus(Enum):
 
 
 @dataclass
-class ProgressEvent(Generic[Properties]):
+class ProgressEvent[Properties]:
     status: OperationStatus
     resource_model: Properties | None = None
     resource_models: list[Properties] | None = None
@@ -165,7 +165,7 @@ def convert_payload(
 
 
 @dataclass
-class ResourceRequest(Generic[Properties]):
+class ResourceRequest[Properties]:
     _original_payload: Properties
 
     aws_client_factory: ServiceLevelClientFactory
@@ -198,7 +198,7 @@ class CloudFormationResourceProviderPlugin(Plugin):
     namespace = "localstack.cloudformation.resource_providers"
 
 
-class ResourceProvider(Generic[Properties]):
+class ResourceProvider[Properties]:
     """
     This provides a base class onto which service-specific resource providers are built.
     """
@@ -401,7 +401,7 @@ class NoResourceProvider(Exception):
     pass
 
 
-def resolve_json_pointer(resource_props: Properties, primary_id_path: str) -> str:
+def resolve_json_pointer[Properties](resource_props: Properties, primary_id_path: str) -> str:
     primary_id_path = primary_id_path.replace("/properties", "")
     parts = [p for p in primary_id_path.split("/") if p]
 
diff --git a/localstack-core/localstack/services/cloudformation/scaffolding/__main__.py b/localstack-core/localstack/services/cloudformation/scaffolding/__main__.py
@@ -420,7 +420,7 @@ def render(
             self.environment, template_mapping[file_type], **kwargs
         )
 
-    def get_getatt_targets(self) -> Generator[str, None, None]:
+    def get_getatt_targets(self) -> Generator[str]:
         for name, defn in self.schema["properties"].items():
             if "type" in defn and defn["type"] in ["string"]:
                 yield name
diff --git a/localstack-core/localstack/services/events/models.py b/localstack-core/localstack/services/events/models.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass, field
 from datetime import UTC, datetime
 from enum import Enum
-from typing import Literal, TypeAlias, TypedDict
+from typing import Literal, TypedDict
 
 from localstack.aws.api import CommonServiceException
 from localstack.aws.api.events import (
@@ -100,7 +100,7 @@ def __init__(self, reason=None, message=None) -> None:
 FormattedEventDict = dict[str, FormattedEvent]
 FormattedEventList = list[FormattedEvent]
 
-TransformedEvent: TypeAlias = FormattedEvent | dict | str
+type TransformedEvent = FormattedEvent | dict | str
 
 
 class ResourceType(Enum):
diff --git a/localstack-core/localstack/services/kms/utils.py b/localstack-core/localstack/services/kms/utils.py
@@ -1,13 +1,10 @@
 import re
 from collections.abc import Callable
-from typing import TypeVar
 
 from localstack.aws.api.kms import DryRunOperationException, Tag, TagException
 from localstack.services.kms.exceptions import ValidationException
 from localstack.utils.aws.arns import ARN_PARTITION_REGEX
 
-T = TypeVar("T")
-
 KMS_KEY_ARN_PATTERN = re.compile(
     rf"{ARN_PARTITION_REGEX}:kms:(?P<region_name>[^:]+):(?P<account_id>\d{{12}}):((?=key/)key/|(?=alias/))(?P<key_id>[^:]+)$"
 )
@@ -63,7 +60,7 @@ def validate_tag(tag_position: int, tag: Tag) -> None:
         raise TagException("Tags beginning with aws: are reserved")
 
 
-def execute_dry_run_capable(func: Callable[..., T], dry_run: bool, *args, **kwargs) -> T:
+def execute_dry_run_capable[T](func: Callable[..., T], dry_run: bool, *args, **kwargs) -> T:
     """
     Executes a function unless dry run mode is enabled.
 
diff --git a/localstack-core/localstack/services/sqs/queue.py b/localstack-core/localstack/services/sqs/queue.py
@@ -1,11 +1,8 @@
 import time
 from queue import Empty, PriorityQueue, Queue
-from typing import Generic, TypeVar
 
-T = TypeVar("T")
 
-
-class InterruptibleQueue(Queue, Generic[T]):
+class InterruptibleQueue[T](Queue):
     # is_shutdown is used to check whether we have triggered a shutdown of the Queue
     is_shutdown: bool
 
@@ -49,5 +46,5 @@ def shutdown(self) -> None:
             self.not_empty.notify_all()
 
 
-class InterruptiblePriorityQueue(PriorityQueue, InterruptibleQueue[T], Generic[T]):
+class InterruptiblePriorityQueue[T](PriorityQueue[T], InterruptibleQueue[T]):
     pass
diff --git a/localstack-core/localstack/services/stepfunctions/asl/component/test_state/state/base_mock.py b/localstack-core/localstack/services/stepfunctions/asl/component/test_state/state/base_mock.py
@@ -1,6 +1,5 @@
 import abc
 import copy
-from typing import Generic, TypeVar
 
 from localstack.services.stepfunctions.asl.component.eval_component import EvalComponent
 from localstack.services.stepfunctions.asl.component.state.state import CommonStateField
@@ -15,10 +14,8 @@
     eval_mocked_response_throw,
 )
 
-T = TypeVar("T", bound=CommonStateField)
 
-
-class MockedBaseState(Generic[T], abc.ABC):
+class MockedBaseState[T: CommonStateField](abc.ABC):
     is_single_state: bool
     _wrapped: T
 
diff --git a/localstack-core/localstack/services/stores.py b/localstack-core/localstack/services/stores.py
@@ -32,7 +32,7 @@ class SqsStore(BaseStore):
 import re
 from collections.abc import Callable, Iterator
 from threading import RLock
-from typing import Any, Generic, TypeVar
+from typing import Any, TypeVar
 
 from localstack import config
 from localstack.utils.aws.aws_stack import get_valid_regions_for_service
@@ -190,7 +190,7 @@ def __repr__(self):
 #
 
 
-class RegionBundle(dict, Generic[BaseStoreType]):
+class RegionBundle[BaseStoreType](dict):
     """
     Encapsulation for stores across all regions for a specific AWS account ID.
     """
@@ -281,7 +281,7 @@ def reset(self, _reset_universal: bool = False):
             self.clear()
 
 
-class AccountRegionBundle(dict, Generic[BaseStoreType]):
+class AccountRegionBundle[BaseStoreType](dict):
     """
     Encapsulation for all stores for all AWS account IDs.
     """
diff --git a/localstack-core/localstack/state/pickle.py b/localstack-core/localstack/state/pickle.py
@@ -30,15 +30,13 @@ def _recreate(obj_type, obj_queue):
 
 import inspect
 from collections.abc import Callable
-from typing import Any, BinaryIO, Generic, TypeVar
+from typing import Any, BinaryIO
 
 import dill
 from dill._dill import MetaCatchingDict
 
 from .core import Decoder, Encoder
 
-_T = TypeVar("_T")
-
 PythonPickler = Any
 """Type placeholder for pickle._Pickler (which has for instance the save_reduce method)"""
 
@@ -268,7 +266,7 @@ def get_default_decoder() -> Decoder:
     return get_default_decoder()
 
 
-class ObjectStateReducer(Generic[_T]):
+class ObjectStateReducer[T]:
     """
     A generalization of the following pattern::
 
@@ -301,7 +299,7 @@ def restore(state: dict):
                 state["this_one_doesnt_serialize"] = restore(state["this_one_serialized"])
     """
 
-    cls: _T
+    cls: T
 
     @classmethod
     def create(cls):
@@ -313,7 +311,7 @@ def register(self, subclasses=False):
         """
         add_dispatch_entry(self.cls, self._pickle, subclasses=subclasses)
 
-    def _pickle(self, pickler, obj: _T):
+    def _pickle(self, pickler, obj: T):
         state = self.get_state(obj)
         self.prepare(obj, state)
         return pickler.save_reduce(self._unpickle, (state,), obj=obj)
@@ -324,7 +322,7 @@ def _unpickle(self, state: dict) -> dict:
         self.set_state(obj, state)
         return obj
 
-    def get_state(self, obj: _T) -> Any:
+    def get_state(self, obj: T) -> Any:
         """
         Return the objects state. Can be overwritten by subclasses to return custom state.
 
@@ -333,7 +331,7 @@ def get_state(self, obj: _T) -> Any:
         """
         return obj.__dict__.copy()
 
-    def set_state(self, obj: _T, state: Any):
+    def set_state(self, obj: T, state: Any):
         """
         Set the state of the object. Can be overwritten by subclasses to set custom state.
 
@@ -342,7 +340,7 @@ def set_state(self, obj: _T, state: Any):
         """
         obj.__dict__.update(state)
 
-    def prepare(self, obj: _T, state: Any):
+    def prepare(self, obj: T, state: Any):
         """
         Can be overwritten by subclasses to prepare the object state for pickling.
 
@@ -351,7 +349,7 @@ def prepare(self, obj: _T, state: Any):
         """
         pass
 
-    def restore(self, obj: _T, state: Any):
+    def restore(self, obj: T, state: Any):
         """
         Can be overwritten by subclasses to modify the object state to restore any previously removed attributes.
 
diff --git a/localstack-core/localstack/testing/aws/util.py b/localstack-core/localstack/testing/aws/util.py
@@ -1,7 +1,6 @@
 import functools
 import os
 from collections.abc import Callable
-from typing import TypeVar
 
 import boto3
 import botocore
@@ -174,10 +173,7 @@ def event_handler(request: AWSPreparedRequest, **_):
         return wrapper_method
 
 
-T = TypeVar("T", bound=BaseClient)
-
-
-def RequestContextClient(client: T) -> T:
+def RequestContextClient[T: BaseClient](client: T) -> T:
     return _RequestContextClient(client)  # noqa
 
 
diff --git a/localstack-core/localstack/utils/threads.py b/localstack-core/localstack/utils/threads.py
@@ -6,13 +6,9 @@
 from collections.abc import Callable
 from concurrent.futures import Future
 from multiprocessing.dummy import Pool
-from typing import TYPE_CHECKING, Any, TypeVar
-
-if TYPE_CHECKING:
-    from typing_extensions import ParamSpec
-
-    P = ParamSpec("P")
+from typing import Any, ParamSpec, TypeVar
 
+P = ParamSpec("P")
 T = TypeVar("T")
 
 LOG = logging.getLogger(__name__)
diff --git a/pyproject.toml b/pyproject.toml
@@ -72,7 +72,6 @@ base-runtime = [
     "python-dateutil>=2.9.0",
     "readerwriterlock>=1.0.7",
     "requests-aws4auth>=1.0",
-    "typing-extensions>=4.15.0",
     # explicitly set urllib3 to force its usage / ensure compatibility
     "urllib3>=2.0.7",
     "Werkzeug>=3.1.3",
@@ -187,7 +186,7 @@ exclude = ["tests*"]
 
 [tool.ruff]
 # Generate code compatible with version defined in .python-version
-target-version = "py311"
+target-version = "py313"
 line-length = 100
 src = ["localstack-core", "tests"]
 exclude = [
diff --git a/tests/aws/services/cloudformation/conftest.py b/tests/aws/services/cloudformation/conftest.py
diff --git a/tests/aws/services/lambda_/test_lambda.py b/tests/aws/services/lambda_/test_lambda.py
diff --git a/tests/aws/services/lambda_/test_lambda_api.py b/tests/aws/services/lambda_/test_lambda_api.py
diff --git a/tests/bootstrap/test_cosmetic_configuration.py b/tests/bootstrap/test_cosmetic_configuration.py

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ def render(`
`420`	`420`	`self.environment, template_mapping[file_type], **kwargs`
`421`	`421`	`)`
`422`	`422`
`423`		`- def get_getatt_targets(self) -> Generator[str, None, None]:`
	`423`	`+ def get_getatt_targets(self) -> Generator[str]:`
`424`	`424`	`for name, defn in self.schema["properties"].items():`
`425`	`425`	`if "type" in defn and defn["type"] in ["string"]:`
`426`	`426`	`yield name`