chore: Update ruff

provinzkraut · provinzkraut · commit f2efdef20ca0 · 2025-08-10T16:59:09.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -24,7 +24,7 @@ repos:
       - id: unasyncd
         additional_dependencies: ["ruff"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.11.5"
+    rev: "v0.12.8"
     hooks:
       - id: ruff
         args: ["--fix"]
diff --git a/litestar/_signature/model.py b/litestar/_signature/model.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006, UP007
 from __future__ import annotations
 
 import re
@@ -102,7 +101,7 @@ def _deserializer(target_type: Any, value: Any, default_deserializer: Callable[[
 class SignatureModel(Struct):
     """Model that represents a function signature that uses a msgspec specific type or types."""
 
-    _data_dto: ClassVar[Optional[type[AbstractDTO]]]
+    _data_dto: ClassVar[type[AbstractDTO] | None]
     _dependency_name_set: ClassVar[set[str]]
     _fields: ClassVar[dict[str, FieldDefinition]]
     _return_annotation: ClassVar[Any]
diff --git a/litestar/contrib/attrs/__init__.py b/litestar/contrib/attrs/__init__.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
diff --git a/litestar/contrib/attrs/attrs_schema_plugin.py b/litestar/contrib/attrs/attrs_schema_plugin.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
diff --git a/litestar/contrib/prometheus/__init__.py b/litestar/contrib/prometheus/__init__.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/prometheus/config.py b/litestar/contrib/prometheus/config.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/prometheus/controller.py b/litestar/contrib/prometheus/controller.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/prometheus/middleware.py b/litestar/contrib/prometheus/middleware.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/pydantic/__init__.py b/litestar/contrib/pydantic/__init__.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
diff --git a/litestar/contrib/pydantic/pydantic_di_plugin.py b/litestar/contrib/pydantic/pydantic_di_plugin.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING  # pragma: no cover
diff --git a/litestar/contrib/pydantic/pydantic_dto_factory.py b/litestar/contrib/pydantic/pydantic_dto_factory.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING  # pragma: no cover
diff --git a/litestar/contrib/pydantic/pydantic_init_plugin.py b/litestar/contrib/pydantic/pydantic_init_plugin.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING  # pragma: no cover
diff --git a/litestar/contrib/pydantic/pydantic_schema_plugin.py b/litestar/contrib/pydantic/pydantic_schema_plugin.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING  # pragma: no cover
diff --git a/litestar/contrib/pydantic/utils.py b/litestar/contrib/pydantic/utils.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/__init__.py b/litestar/contrib/sqlalchemy/__init__.py
@@ -1,4 +1,3 @@
-# ruff: noqa: TC004, F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/base.py b/litestar/contrib/sqlalchemy/base.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 """Application ORM configuration."""
 
diff --git a/litestar/contrib/sqlalchemy/dto.py b/litestar/contrib/sqlalchemy/dto.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 """SQLAlchemy DTO configuration."""
 
diff --git a/litestar/contrib/sqlalchemy/plugins/__init__.py b/litestar/contrib/sqlalchemy/plugins/__init__.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/contrib/sqlalchemy/plugins/init/__init__.py b/litestar/contrib/sqlalchemy/plugins/init/__init__.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/contrib/sqlalchemy/plugins/init/config/__init__.py b/litestar/contrib/sqlalchemy/plugins/init/config/__init__.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004,F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/plugins/init/config/asyncio.py b/litestar/contrib/sqlalchemy/plugins/init/config/asyncio.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/contrib/sqlalchemy/plugins/init/config/common.py b/litestar/contrib/sqlalchemy/plugins/init/config/common.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/plugins/init/config/engine.py b/litestar/contrib/sqlalchemy/plugins/init/config/engine.py
@@ -1,4 +1,3 @@
-# ruff: noqa: TC004, F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/plugins/init/config/sync.py b/litestar/contrib/sqlalchemy/plugins/init/config/sync.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 
 from __future__ import annotations
 
diff --git a/litestar/contrib/sqlalchemy/plugins/init/plugin.py b/litestar/contrib/sqlalchemy/plugins/init/plugin.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/contrib/sqlalchemy/plugins/serialization.py b/litestar/contrib/sqlalchemy/plugins/serialization.py
@@ -1,4 +1,3 @@
-# ruff: noqa: TC004
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/repository/__init__.py b/litestar/contrib/sqlalchemy/repository/__init__.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/contrib/sqlalchemy/repository/_async.py b/litestar/contrib/sqlalchemy/repository/_async.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/repository/_sync.py b/litestar/contrib/sqlalchemy/repository/_sync.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # Do not edit this file directly. It has been autogenerated from
 # litestar/contrib/sqlalchemy/repository/_async.py
 from __future__ import annotations
diff --git a/litestar/contrib/sqlalchemy/repository/_util.py b/litestar/contrib/sqlalchemy/repository/_util.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/litestar/contrib/sqlalchemy/repository/types.py b/litestar/contrib/sqlalchemy/repository/types.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/contrib/sqlalchemy/types.py b/litestar/contrib/sqlalchemy/types.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/datastructures/headers.py b/litestar/datastructures/headers.py
@@ -15,7 +15,7 @@
 )
 
 import msgspec
-from multidict import CIMultiDict, CIMultiDictProxy, MultiMapping, MultiDict
+from multidict import CIMultiDict, CIMultiDictProxy, MultiDict
 
 from litestar._multipart import parse_content_header
 from litestar.datastructures.multi_dicts import MultiMixin
diff --git a/litestar/handlers/websocket_handlers/listener.py b/litestar/handlers/websocket_handlers/listener.py
@@ -277,8 +277,8 @@ def _validate_handler_function(self) -> None:
     async def default_connection_lifespan(
         self,
         socket: WebSocket,
-        on_accept_dependencies: Optional[dict[str, Any]] = None,  # noqa: UP007
-        on_disconnect_dependencies: Optional[dict[str, Any]] = None,  # noqa: UP007
+        on_accept_dependencies: Optional[dict[str, Any]] = None,  # noqa: UP045
+        on_disconnect_dependencies: Optional[dict[str, Any]] = None,  # noqa: UP045
     ) -> AsyncGenerator[None, None]:
         """Handle the connection lifespan of a :class:`WebSocket <.connection.WebSocket>`.
 
diff --git a/litestar/pagination.py b/litestar/pagination.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006,UP007
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
@@ -74,7 +73,7 @@ class CursorPagination(Generic[C, T]):
     """List of data being sent as part of the response."""
     results_per_page: int
     """Maximal number of items to send."""
-    cursor: Optional[C]
+    cursor: Optional[C]  # noqa: UP045
     """Unique ID, designating the last identifier in the given data set.
 
     This value can be used to request the "next" batch of records.
diff --git a/litestar/plugins/htmx.py b/litestar/plugins/htmx.py
@@ -1,4 +1,3 @@
-# ruff: noqa: TC004, F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/plugins/sqlalchemy.py b/litestar/plugins/sqlalchemy.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/litestar/response/base.py b/litestar/response/base.py
@@ -217,7 +217,7 @@ class Response(Generic[T]):
     )
 
     content: T
-    type_encoders: Optional[TypeEncodersMap] = None  # noqa: UP007
+    type_encoders: Optional[TypeEncodersMap] = None  # noqa: UP045
 
     def __init__(
         self,
diff --git a/litestar/security/jwt/token.py b/litestar/security/jwt/token.py
@@ -3,7 +3,7 @@
 import dataclasses
 from dataclasses import asdict, dataclass, field
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, Optional, TypedDict
+from typing import TYPE_CHECKING, Any, TypedDict
 
 import jwt
 import msgspec
@@ -57,11 +57,11 @@ class Token:
     """Subject - usually a unique identifier of the user or equivalent entity."""
     iat: datetime = field(default_factory=lambda: _normalize_datetime(datetime.now(timezone.utc)))
     """Issued at - should always be current now."""
-    iss: Optional[str] = field(default=None)  # noqa: UP007
+    iss: str | None = field(default=None)
     """Issuer - optional unique identifier for the issuer."""
-    aud: Optional[str] = field(default=None)  # noqa: UP007
+    aud: str | None = field(default=None)
     """Audience - intended audience."""
-    jti: Optional[str] = field(default=None)  # noqa: UP007
+    jti: str | None = field(default=None)
     """JWT ID - a unique identifier of the JWT between different issuers."""
     extras: dict[str, Any] = field(default_factory=dict)
     """Extra fields that were found on the JWT token."""
diff --git a/litestar/stores/base.py b/litestar/stores/base.py
@@ -2,7 +2,7 @@
 
 from abc import ABC, abstractmethod
 from datetime import datetime, timedelta, timezone
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from msgspec import Struct
 from msgspec.msgpack import decode as msgpack_decode
@@ -112,7 +112,7 @@ def with_namespace(self, namespace: str) -> Self:
 class StorageObject(Struct):
     """:class:`msgspec.Struct` to store serialized data alongside with their expiry time."""
 
-    expires_at: Optional[datetime]  # noqa: UP007
+    expires_at: datetime | None
     data: bytes
 
     @classmethod
diff --git a/pyproject.toml b/pyproject.toml
@@ -431,6 +431,8 @@ lint.ignore = [
   "CPY001",  # ruff - copyright notice at the top of the file
   "SIM108",  # Use ternary operator
   "A005",    # Module shadows a built-in Python standard library module
+  "PLC0415", # `import` should be at the top-level of a file
+  "PLW1641", # Object does not implement `__hash__` method
 ]
 lint.select = [
   "A",   # flake8-builtins
@@ -537,6 +539,7 @@ known-first-party = ["litestar", "tests", "examples"]
 "tests/unit/test_typing.py" = ["UP006", "UP035"]
 "tools/**/*.*" = ["D", "ARG", "EM", "TRY", "G", "FBT"]
 "tools/prepare_release.py" = ["S603", "S607"]
+"tests/*" = ["PLC0415", "UP045"]
 
 [tool.ruff.format]
 docstring-code-format = true
diff --git a/tests/e2e/test_exception_handlers/test_exception_handler_registered_on_handler.py b/tests/e2e/test_exception_handlers/test_exception_handler_registered_on_handler.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006
 from __future__ import annotations
 
 from unittest.mock import MagicMock
diff --git a/tests/e2e/test_middleware/test_exception_handler_called_from_mounted_app.py b/tests/e2e/test_middleware/test_exception_handler_called_from_mounted_app.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
diff --git a/tests/unit/test_app.py b/tests/unit/test_app.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006
 from __future__ import annotations
 
 import inspect
diff --git a/tests/unit/test_contrib/test_attrs.py b/tests/unit/test_contrib/test_attrs.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 import sys
diff --git a/tests/unit/test_contrib/test_htmx/test_htmx_deprecations.py b/tests/unit/test_contrib/test_htmx/test_htmx_deprecations.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 import importlib.util
 import sys
 from pathlib import Path
diff --git a/tests/unit/test_contrib/test_prometheus.py b/tests/unit/test_contrib/test_prometheus.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 import importlib
diff --git a/tests/unit/test_contrib/test_pydantic.py b/tests/unit/test_contrib/test_pydantic.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 from __future__ import annotations
 
 import importlib
diff --git a/tests/unit/test_contrib/test_sqlalchemy.py b/tests/unit/test_contrib/test_sqlalchemy.py
@@ -1,4 +1,4 @@
-# ruff: noqa: TC004, F401
+# ruff: noqa: F401
 # pyright: reportUnusedImport=false
 from __future__ import annotations
 
diff --git a/tests/unit/test_dto/conftest.py b/tests/unit/test_dto/conftest.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006
 from __future__ import annotations
 
 from collections.abc import Collection, Generator
diff --git a/tests/unit/test_dto/test_factory/test_backends/test_backends.py b/tests/unit/test_dto/test_factory/test_backends/test_backends.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006,UP007
 from __future__ import annotations
 
 import inspect
diff --git a/tests/unit/test_dto/test_factory/test_base_dto.py b/tests/unit/test_dto/test_factory/test_base_dto.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006
 from __future__ import annotations
 
 import dataclasses
diff --git a/tests/unit/test_dto/test_factory/test_integration.py b/tests/unit/test_dto/test_factory/test_integration.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP007, UP006
 from __future__ import annotations
 
 from collections.abc import Sequence
diff --git a/tests/unit/test_kwargs/test_multipart_data.py b/tests/unit/test_kwargs/test_multipart_data.py
@@ -1,4 +1,3 @@
-# ruff: noqa: UP006, UP007
 from __future__ import annotations
 
 from collections import defaultdict
diff --git a/tests/unit/test_openapi/test_integration.py b/tests/unit/test_openapi/test_integration.py
diff --git a/tests/unit/test_openapi/test_responses.py b/tests/unit/test_openapi/test_responses.py
diff --git a/tests/unit/test_plugins/test_pydantic/test_dto.py b/tests/unit/test_plugins/test_pydantic/test_dto.py
diff --git a/tests/unit/test_utils/test_signature.py b/tests/unit/test_utils/test_signature.py
diff --git a/tools/build_docs.py b/tools/build_docs.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# ruff: noqa: TC004, F401`
	`1`	`+# ruff: noqa: F401`
`2`	`2`	`from __future__ import annotations`
`3`	`3`
`4`	`4`	`from typing import TYPE_CHECKING, Any`