feat: Ensure we have real Python 3.9 to 3.13 compatibility

Author: ddanier

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: end-of-file-fixer
       - id: check-added-large-files
       - id: check-merge-conflict
       - id: check-docstring-first
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.1
+    rev: v0.8.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -17,7 +17,7 @@ repos:
     hooks:
       - id: python-safety-dependencies-check
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-    rev: v9.16.0
+    rev: v9.19.0
     hooks:
       - id: commitlint
         stages: [commit-msg]

pydantic_async_validation/fastapi.py

@@ -1,15 +1,16 @@
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Generator, List, Optional, Tuple, Union
+from typing import Optional, Union
 
 from fastapi.exceptions import RequestValidationError
 from pydantic import ValidationError
 from pydantic_core import ErrorDetails
 
 
 def _prefix_request_errors(
-    prefix: Tuple[Union[int, str], ...],
-    errors: List[ErrorDetails],
-) -> List[ErrorDetails]:
+    prefix: tuple[Union[int, str], ...],
+    errors: list[ErrorDetails],
+) -> list[ErrorDetails]:
     """Add prefix to errors in preparation for request validation error conversion."""
 
     return [
@@ -25,7 +26,7 @@ def _prefix_request_errors(
 
 @contextmanager
 def ensure_request_validation_errors(
-    prefix: Optional[Union[Tuple[Union[int, str], ...], str]] = None,
+    prefix: Optional[Union[tuple[Union[int, str], ...], str]] = None,
 ) -> Generator[None, None, None]:
     """
     Converter for `ValidationError` to `RequestValidationError`.

pydantic_async_validation/metaclasses.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Optional
 
 from pydantic._internal._model_construction import ModelMetaclass
 
@@ -21,10 +21,10 @@ def __new__(
         namespace: dict[str, Any],
         **kwargs: Any,
     ) -> Any:
-        async_field_validators: List[Tuple[List[str], ValidationInfo]] = []
-        async_model_validators: List[ValidationInfo] = []
+        async_field_validators: list[tuple[list[str], ValidationInfo]] = []
+        async_model_validators: list[ValidationInfo] = []
 
-        async_field_validator_fields: Optional[List[str]]
+        async_field_validator_fields: Optional[list[str]]
         async_field_validator_config: Optional[ValidationInfo]
         async_model_validator_config: Optional[ValidationInfo]
 

pydantic_async_validation/mixins.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, List, Tuple, Union
+from typing import ClassVar, Union
 
 import pydantic
 from pydantic_core import InitErrorDetails, PydanticCustomError, ValidationError
@@ -19,8 +19,8 @@ class AsyncValidationModelMixin(
     metaclass=AsyncValidationModelMetaclass,
 ):
     # MUST match names defined in constants.py!
-    pydantic_model_async_field_validators: ClassVar[List[Tuple[List[str], ValidationInfo]]]
-    pydantic_model_async_model_validators: ClassVar[List[ValidationInfo]]
+    pydantic_model_async_field_validators: ClassVar[list[tuple[list[str], ValidationInfo]]]
+    pydantic_model_async_model_validators: ClassVar[list[ValidationInfo]]
 
     async def model_async_validate(self) -> None:
         """
@@ -82,7 +82,7 @@ async def model_async_validate(self) -> None:
 
         # Also call async validation on attribute values
         async def extend_with_validation_errors_by(
-            prefix: Tuple[Union[int, str], ...],
+            prefix: tuple[Union[int, str], ...],
             instance: AsyncValidationModelMixin,
         ) -> None:
             try:

pydantic_async_validation/utils.py

@@ -1,6 +1,6 @@
 from functools import wraps
 from inspect import Signature, signature
-from typing import Callable, List, Tuple, Union, cast
+from typing import Callable, Union, cast
 
 from pydantic import PydanticUserError
 from pydantic_core import ErrorDetails, InitErrorDetails, PydanticCustomError
@@ -163,9 +163,9 @@ def generic_model_validator_wrapper(
 
 
 def prefix_errors(
-    prefix: Tuple[Union[int, str], ...],
-    errors: Union[List[InitErrorDetails], List[ErrorDetails]],
-) -> List[InitErrorDetails]:
+    prefix: tuple[Union[int, str], ...],
+    errors: Union[list[InitErrorDetails], list[ErrorDetails]],
+) -> list[InitErrorDetails]:
     """
     Extend all errors passed as list to include an additional prefix.
 

pydantic_async_validation/validators.py

@@ -1,5 +1,5 @@
 from types import FunctionType
-from typing import TYPE_CHECKING, Any, Callable, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Callable, Optional
 
 from pydantic.errors import PydanticUserError
 
@@ -64,7 +64,7 @@ def async_field_validator(
             code='validator-instance-method',
         )
 
-    field_names: Tuple[str, ...] = __field_name, *additional_field_names
+    field_names: tuple[str, ...] = __field_name, *additional_field_names
 
     def dec(func: Callable) -> Callable:
         setattr(

pyproject.toml

@@ -27,12 +27,12 @@ pyright = ">=1.1.350,<1.2"
 
 [tool.ruff]
 line-length = 115
-target-version = "py38"
+target-version = "py39"
 output-format = "grouped"
 
 [tool.ruff.lint]
 select = ["F","E","W","C","I","N","UP","ANN","S","B","A","COM","C4","T20","PT","ARG","TD","RUF"]
-ignore = ["A001","A002","A003","ANN101","ANN102","ANN401","C901","N8","B008","F405","F821"]
+ignore = ["A001","A002","A003","ANN401","C901","N8","B008","F405","F821"]
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]

tests/test_field_validators.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Set, Tuple
+from typing import Any
 
 import pydantic
 import pytest
@@ -129,9 +129,9 @@ async def validate_name(self, config: ValidationInfo) -> None:
 async def test_async_validation_will_call_sub_model_validation():
     class OtherModel(AsyncValidationModelMixin, pydantic.BaseModel):
         something: SomethingModel
-        something_list: List[SomethingModel]
-        something_tuple: Tuple[SomethingModel]
-        somethings_by_name: Dict[str, SomethingModel]
+        something_list: list[SomethingModel]
+        something_tuple: tuple[SomethingModel]
+        somethings_by_name: dict[str, SomethingModel]
 
     instance = OtherModel(
         something=SomethingModel(name="invalid", age=1),

tests/test_model_validators.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List
+from typing import Any
 
 import pydantic
 import pytest
@@ -94,8 +94,8 @@ async def validate_name(self, config: ValidationInfo) -> None:
 async def test_async_validation_will_call_sub_model_validation():
     class OtherModel(AsyncValidationModelMixin, pydantic.BaseModel):
         something: SomethingModel
-        somethings: List[SomethingModel]
-        somethings_by_name: Dict[str, SomethingModel]
+        somethings: list[SomethingModel]
+        somethings_by_name: dict[str, SomethingModel]
 
     instance = OtherModel(
         something=SomethingModel(name="invalid", age=1),