Merge pull request #456 from python-openapi/feature/python-3.9-drop

Python 3.9 drop

Author: p1c2u

.github/workflows/python-test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
         os: [windows-latest, ubuntu-latest]
       fail-fast: false
     steps:

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     rev: v3.21.2
     hooks:
       - id: pyupgrade
-        args: ["--py39-plus"]
+        args: ["--py310-plus"]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 25.12.0

openapi_spec_validator/__main__.py

@@ -2,7 +2,6 @@
 import sys
 from argparse import ArgumentParser
 from collections.abc import Sequence
-from typing import Optional
 
 from jsonschema.exceptions import ValidationError
 from jsonschema.exceptions import best_match
@@ -51,7 +50,7 @@ def print_validationerror(
             )
 
 
-def main(args: Optional[Sequence[str]] = None) -> None:
+def main(args: Sequence[str] | None = None) -> None:
     parser = ArgumentParser()
     parser.add_argument(
         "file",
@@ -78,7 +77,7 @@ def main(args: Optional[Sequence[str]] = None) -> None:
     for filename in args_parsed.file:
         # choose source
         reader = read_from_filename
-        if filename in ["-", "/-"]:
+        if filename in {"-", "/-"}:
             filename = "stdin"
             reader = read_from_stdin
 

openapi_spec_validator/schemas/types.py

@@ -1,6 +1,4 @@
-from typing import Union
-
 from jsonschema_path.paths import SchemaPath
 from jsonschema_path.typing import Schema
 
-AnySchema = Union[Schema, SchemaPath]
+AnySchema = Schema | SchemaPath

openapi_spec_validator/shortcuts.py

@@ -2,7 +2,6 @@
 
 import warnings
 from collections.abc import Mapping
-from typing import Optional
 
 from jsonschema_path import SchemaPath
 from jsonschema_path.handlers import all_urls_handler
@@ -39,7 +38,7 @@ def get_validator_cls(spec: Schema) -> SpecValidatorType:
 def validate(
     spec: Schema,
     base_uri: str = "",
-    cls: Optional[SpecValidatorType] = None,
+    cls: SpecValidatorType | None = None,
 ) -> None:
     if cls is None:
         cls = get_validator_cls(spec)
@@ -50,7 +49,7 @@ def validate(
 
 def validate_url(
     spec_url: str,
-    cls: Optional[type[SpecValidator]] = None,
+    cls: type[SpecValidator] | None = None,
 ) -> None:
     spec = all_urls_handler(spec_url)
     return validate(spec, base_uri=spec_url, cls=cls)
@@ -59,9 +58,9 @@ def validate_url(
 def validate_spec(
     spec: Schema,
     base_uri: str = "",
-    validator: Optional[SupportsValidation] = None,
-    cls: Optional[SpecValidatorType] = None,
-    spec_url: Optional[str] = None,
+    validator: SupportsValidation | None = None,
+    cls: SpecValidatorType | None = None,
+    spec_url: str | None = None,
 ) -> None:
     warnings.warn(
         "validate_spec shortcut is deprecated. Use validate instead.",
@@ -81,8 +80,8 @@ def validate_spec(
 
 def validate_spec_url(
     spec_url: str,
-    validator: Optional[SupportsValidation] = None,
-    cls: Optional[type[SpecValidator]] = None,
+    validator: SupportsValidation | None = None,
+    cls: type[SpecValidator] | None = None,
 ) -> None:
     warnings.warn(
         "validate_spec_url shortcut is deprecated. Use validate_url instead.",

openapi_spec_validator/validation/decorators.py

@@ -1,29 +1,29 @@
 """OpenAPI spec validator validation decorators module."""
 
 import logging
+from collections.abc import Callable
 from collections.abc import Iterable
 from collections.abc import Iterator
 from functools import wraps
-from typing import Any
-from typing import Callable
+from typing import ParamSpec
 from typing import TypeVar
 
 from jsonschema.exceptions import ValidationError
 
 from openapi_spec_validator.validation.caches import CachedIterable
 from openapi_spec_validator.validation.exceptions import OpenAPIValidationError
 
-Args = TypeVar("Args")
+P = ParamSpec("P")
 T = TypeVar("T")
 
 log = logging.getLogger(__name__)
 
 
 def wraps_errors(
-    func: Callable[..., Any],
-) -> Callable[..., Iterator[ValidationError]]:
+    func: Callable[P, Iterator[ValidationError]],
+) -> Callable[P, Iterator[ValidationError]]:
     @wraps(func)
-    def wrapper(*args: Any, **kwds: Any) -> Iterator[ValidationError]:
+    def wrapper(*args: P.args, **kwds: P.kwargs) -> Iterator[ValidationError]:
         errors = func(*args, **kwds)
         for err in errors:
             if not isinstance(err, OpenAPIValidationError):
@@ -36,21 +36,21 @@ def wrapper(*args: Any, **kwds: Any) -> Iterator[ValidationError]:
 
 
 def wraps_cached_iter(
-    func: Callable[[Args], Iterator[T]],
-) -> Callable[[Args], CachedIterable[T]]:
+    func: Callable[P, Iterator[T]],
+) -> Callable[P, CachedIterable[T]]:
     @wraps(func)
-    def wrapper(*args: Any, **kwargs: Any) -> CachedIterable[T]:
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> CachedIterable[T]:
         result = func(*args, **kwargs)
         return CachedIterable(result)
 
     return wrapper
 
 
 def unwraps_iter(
-    func: Callable[[Args], Iterable[T]],
-) -> Callable[[Args], Iterator[T]]:
+    func: Callable[P, Iterable[T]],
+) -> Callable[P, Iterator[T]]:
     @wraps(func)
-    def wrapper(*args: Any, **kwargs: Any) -> Iterator[T]:
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> Iterator[T]:
         result = func(*args, **kwargs)
         return iter(result)
 

openapi_spec_validator/validation/keywords.py

@@ -1,9 +1,9 @@
 import string
 from collections.abc import Iterator
+from collections.abc import Callable
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Optional
 from typing import cast
 
 from jsonschema._format import FormatChecker
@@ -38,7 +38,7 @@ def __init__(self, registry: "KeywordValidatorRegistry"):
 
 
 class ValueValidator(KeywordValidator):
-    value_validator_cls: Validator = NotImplemented
+    value_validator_cls: Callable[..., Validator] = NotImplemented
     value_validator_format_checker: FormatChecker = NotImplemented
 
     def __call__(
@@ -67,7 +67,7 @@ class SchemaValidator(KeywordValidator):
     def __init__(self, registry: "KeywordValidatorRegistry"):
         super().__init__(registry)
 
-        self.schema_ids_registry: Optional[list[int]] = []
+        self.schema_ids_registry: list[int] | None = []
 
     @property
     def default_validator(self) -> ValueValidator:
@@ -309,7 +309,7 @@ class OperationValidator(KeywordValidator):
     def __init__(self, registry: "KeywordValidatorRegistry"):
         super().__init__(registry)
 
-        self.operation_ids_registry: Optional[list[str]] = []
+        self.operation_ids_registry: list[str] | None = []
 
     @property
     def responses_validator(self) -> ResponsesValidator:
@@ -324,7 +324,7 @@ def __call__(
         url: str,
         name: str,
         operation: SchemaPath,
-        path_parameters: Optional[SchemaPath],
+        path_parameters: SchemaPath | None,
     ) -> Iterator[ValidationError]:
         assert self.operation_ids_registry is not None
 

openapi_spec_validator/validation/protocols.py

@@ -1,5 +1,4 @@
 from collections.abc import Iterator
-from typing import Optional
 from typing import Protocol
 from typing import runtime_checkable
 
@@ -16,12 +15,12 @@ def iter_errors(
         self,
         instance: Schema,
         base_uri: str = "",
-        spec_url: Optional[str] = None,
+        spec_url: str | None = None,
     ) -> Iterator[OpenAPIValidationError]: ...
 
     def validate(
         self,
         instance: Schema,
         base_uri: str = "",
-        spec_url: Optional[str] = None,
+        spec_url: str | None = None,
     ) -> None: ...

openapi_spec_validator/validation/proxies.py

@@ -3,12 +3,10 @@
 import warnings
 from collections.abc import Iterator
 from collections.abc import Mapping
-from typing import Optional
 
 from jsonschema.exceptions import ValidationError
 from jsonschema_path.typing import Schema
 
-from openapi_spec_validator.validation.exceptions import OpenAPIValidationError
 from openapi_spec_validator.validation.exceptions import ValidatorDetectError
 from openapi_spec_validator.validation.types import SpecValidatorType
 
@@ -18,7 +16,7 @@ def __init__(
         self,
         cls: SpecValidatorType,
         deprecated: str = "SpecValidator",
-        use: Optional[str] = None,
+        use: str | None = None,
     ):
         self.cls = cls
 
@@ -29,7 +27,7 @@ def validate(
         self,
         schema: Schema,
         base_uri: str = "",
-        spec_url: Optional[str] = None,
+        spec_url: str | None = None,
     ) -> None:
         for err in self.iter_errors(
             schema,
@@ -46,7 +44,7 @@ def iter_errors(
         self,
         schema: Schema,
         base_uri: str = "",
-        spec_url: Optional[str] = None,
+        spec_url: str | None = None,
     ) -> Iterator[ValidationError]:
         warnings.warn(
             f"{self.deprecated} is deprecated. Use {self.use} instead.",
@@ -70,7 +68,7 @@ def validate(
         self,
         instance: Schema,
         base_uri: str = "",
-        spec_url: Optional[str] = None,
+        spec_url: str | None = None,
     ) -> None:
         validator = self.detect(instance)
         for err in validator.iter_errors(
@@ -87,8 +85,8 @@ def iter_errors(
         self,
         instance: Schema,
         base_uri: str = "",
-        spec_url: Optional[str] = None,
-    ) -> Iterator[OpenAPIValidationError]:
+        spec_url: str | None = None,
+    ) -> Iterator[ValidationError]:
         warnings.warn(
             "openapi_spec_validator_proxy is deprecated.",
             DeprecationWarning,

openapi_spec_validator/validation/registries.py

@@ -1,12 +1,10 @@
-from __future__ import annotations
-
+from collections import defaultdict
 from collections.abc import Mapping
-from typing import DefaultDict
 
 from openapi_spec_validator.validation.keywords import KeywordValidator
 
 
-class KeywordValidatorRegistry(DefaultDict[str, KeywordValidator]):
+class KeywordValidatorRegistry(defaultdict[str, KeywordValidator]):
     def __init__(
         self, keyword_validators: Mapping[str, type[KeywordValidator]]
     ):