Merge pull request #407 from kurtmckee/update-pre-commit-hooks

p1c2u · web-flow · commit 14654ca7a598 · 2026-01-06T14:58:50.000Z
Update pre-commit hooks
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 ---
-default_stages: [commit, push]
+default_stages: [pre-commit, pre-push]
 default_language_version:
   # force all unspecified python hooks to run python3
   python: python3
@@ -10,37 +10,22 @@ repos:
       - id: check-hooks-apply
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.19.0
+    rev: v3.21.2
     hooks:
       - id: pyupgrade
-        args: ["--py36-plus"]
+        args: ["--py39-plus"]
 
-  - repo: local
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.12.0
     hooks:
-      - id: flynt
-        name: Convert to f-strings with flynt
-        entry: flynt
-        language: python
-        additional_dependencies: ['flynt==0.76']
-
       - id: black
-        name: black
-        entry: black
-        language: system
-        require_serial: true
-        types: [python]
 
+  - repo: https://github.com/pycqa/isort
+    rev: 7.0.0
+    hooks:
       - id: isort
-        name: isort
-        entry: isort
-        args: ['--filter-files']
-        language: system
-        require_serial: true
-        types: [python]
 
-      - id: pyflakes
-        name: pyflakes
-        entry: pyflakes
-        language: system
-        require_serial: true
-        types: [python]
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.3.0
+    hooks:
+      - id: flake8
diff --git a/openapi_spec_validator/__init__.py b/openapi_spec_validator/__init__.py
@@ -1,4 +1,5 @@
 """OpenAPI spec validator module."""
+
 from openapi_spec_validator.shortcuts import validate
 from openapi_spec_validator.shortcuts import validate_spec
 from openapi_spec_validator.shortcuts import validate_spec_url
diff --git a/openapi_spec_validator/__main__.py b/openapi_spec_validator/__main__.py
@@ -1,8 +1,8 @@
 import logging
 import sys
 from argparse import ArgumentParser
+from collections.abc import Sequence
 from typing import Optional
-from typing import Sequence
 
 from jsonschema.exceptions import ValidationError
 from jsonschema.exceptions import best_match
diff --git a/openapi_spec_validator/readers.py b/openapi_spec_validator/readers.py
@@ -1,18 +1,17 @@
 import sys
 from os import path
 from pathlib import Path
-from typing import Tuple
 
 from jsonschema_path.handlers import all_urls_handler
 from jsonschema_path.handlers import file_handler
 from jsonschema_path.typing import Schema
 
 
-def read_from_stdin(filename: str) -> Tuple[Schema, str]:
+def read_from_stdin(filename: str) -> tuple[Schema, str]:
     return file_handler(sys.stdin), ""  # type: ignore
 
 
-def read_from_filename(filename: str) -> Tuple[Schema, str]:
+def read_from_filename(filename: str) -> tuple[Schema, str]:
     if not path.isfile(filename):
         raise OSError(f"No such file: {filename}")
 
diff --git a/openapi_spec_validator/schemas/__init__.py b/openapi_spec_validator/schemas/__init__.py
@@ -1,4 +1,5 @@
 """OpenAIP spec validator schemas module."""
+
 from functools import partial
 
 from jsonschema.validators import Draft4Validator
diff --git a/openapi_spec_validator/schemas/utils.py b/openapi_spec_validator/schemas/utils.py
@@ -1,14 +1,14 @@
 """OpenAIP spec validator schemas utils module."""
+
 from importlib.resources import as_file
 from importlib.resources import files
 from os import path
-from typing import Tuple
 
 from jsonschema_path.readers import FilePathReader
 from jsonschema_path.typing import Schema
 
 
-def get_schema(version: str) -> Tuple[Schema, str]:
+def get_schema(version: str) -> tuple[Schema, str]:
     schema_path = f"resources/schemas/v{version}/schema.json"
     ref = files("openapi_spec_validator") / schema_path
     with as_file(ref) as resource_path:
diff --git a/openapi_spec_validator/shortcuts.py b/openapi_spec_validator/shortcuts.py
@@ -1,8 +1,8 @@
 """OpenAPI spec validator shortcuts module."""
+
 import warnings
-from typing import Mapping
+from collections.abc import Mapping
 from typing import Optional
-from typing import Type
 
 from jsonschema_path import SchemaPath
 from jsonschema_path.handlers import all_urls_handler
@@ -50,7 +50,7 @@ def validate(
 
 def validate_url(
     spec_url: str,
-    cls: Optional[Type[SpecValidator]] = None,
+    cls: Optional[type[SpecValidator]] = None,
 ) -> None:
     spec = all_urls_handler(spec_url)
     return validate(spec, base_uri=spec_url, cls=cls)
@@ -82,7 +82,7 @@ def validate_spec(
 def validate_spec_url(
     spec_url: str,
     validator: Optional[SupportsValidation] = None,
-    cls: Optional[Type[SpecValidator]] = None,
+    cls: Optional[type[SpecValidator]] = None,
 ) -> None:
     warnings.warn(
         "validate_spec_url shortcut is deprecated. Use validate_url instead.",
diff --git a/openapi_spec_validator/validation/caches.py b/openapi_spec_validator/validation/caches.py
@@ -1,7 +1,6 @@
+from collections.abc import Iterable
+from collections.abc import Iterator
 from typing import Generic
-from typing import Iterable
-from typing import Iterator
-from typing import List
 from typing import TypeVar
 
 T = TypeVar("T")
@@ -14,7 +13,7 @@ class CachedIterable(Iterable[T], Generic[T]):
     It should not be iterated by his own.
     """
 
-    cache: List[T]
+    cache: list[T]
     iter: Iterator[T]
     completed: bool
 
diff --git a/openapi_spec_validator/validation/decorators.py b/openapi_spec_validator/validation/decorators.py
@@ -1,10 +1,11 @@
 """OpenAPI spec validator validation decorators module."""
+
 import logging
+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 Iterable
-from typing import Iterator
 from typing import TypeVar
 
 from jsonschema.exceptions import ValidationError
@@ -19,7 +20,7 @@
 
 
 def wraps_errors(
-    func: Callable[..., Any]
+    func: Callable[..., Any],
 ) -> Callable[..., Iterator[ValidationError]]:
     @wraps(func)
     def wrapper(*args: Any, **kwds: Any) -> Iterator[ValidationError]:
@@ -35,7 +36,7 @@ def wrapper(*args: Any, **kwds: Any) -> Iterator[ValidationError]:
 
 
 def wraps_cached_iter(
-    func: Callable[[Args], Iterator[T]]
+    func: Callable[[Args], Iterator[T]],
 ) -> Callable[[Args], CachedIterable[T]]:
     @wraps(func)
     def wrapper(*args: Any, **kwargs: Any) -> CachedIterable[T]:
@@ -46,7 +47,7 @@ def wrapper(*args: Any, **kwargs: Any) -> CachedIterable[T]:
 
 
 def unwraps_iter(
-    func: Callable[[Args], Iterable[T]]
+    func: Callable[[Args], Iterable[T]],
 ) -> Callable[[Args], Iterator[T]]:
     @wraps(func)
     def wrapper(*args: Any, **kwargs: Any) -> Iterator[T]:
diff --git a/openapi_spec_validator/validation/keywords.py b/openapi_spec_validator/validation/keywords.py
@@ -1,9 +1,8 @@
 import string
+from collections.abc import Iterator
+from collections.abc import Sequence
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Sequence
-from typing import Iterator
-from typing import List
 from typing import Optional
 from typing import cast
 
@@ -68,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: Optional[list[int]] = []
 
     @property
     def default_validator(self) -> ValueValidator:
@@ -113,8 +112,9 @@ def __call__(
             all_of = schema / "allOf"
             for inner_schema in all_of:
                 yield from self(inner_schema, require_properties=False)
-                nested_properties += list(self._collect_properties(inner_schema))
-
+                nested_properties += list(
+                    self._collect_properties(inner_schema)
+                )
 
         if "anyOf" in schema:
             any_of = schema / "anyOf"
@@ -154,8 +154,12 @@ def __call__(
                     require_properties=False,
                 )
 
-        required = "required" in schema and (schema / "required").read_value() or []
-        properties = "properties" in schema and (schema / "properties").keys() or []
+        required = (
+            "required" in schema and (schema / "required").read_value() or []
+        )
+        properties = (
+            "properties" in schema and (schema / "properties").keys() or []
+        )
         if "allOf" in schema:
             extra_properties = list(
                 set(required) - set(properties) - set(nested_properties)
@@ -305,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: Optional[list[str]] = []
 
     @property
     def responses_validator(self) -> ResponsesValidator:
@@ -356,8 +360,7 @@ def __call__(
         for path in self._get_path_params_from_url(url):
             if path not in all_params:
                 yield UnresolvableParameterError(
-                    "Path parameter '{}' for '{}' operation in '{}' "
-                    "was not resolved".format(path, name, url)
+                    f"Path parameter '{path}' for '{name}' operation in '{url}' was not resolved"
                 )
         return
 
diff --git a/openapi_spec_validator/validation/protocols.py b/openapi_spec_validator/validation/protocols.py
@@ -1,4 +1,4 @@
-from typing import Iterator
+from collections.abc import Iterator
 from typing import Optional
 from typing import Protocol
 from typing import runtime_checkable
@@ -10,21 +10,18 @@
 
 @runtime_checkable
 class SupportsValidation(Protocol):
-    def is_valid(self, instance: Schema) -> bool:
-        ...
+    def is_valid(self, instance: Schema) -> bool: ...
 
     def iter_errors(
         self,
         instance: Schema,
         base_uri: str = "",
         spec_url: Optional[str] = None,
-    ) -> Iterator[OpenAPIValidationError]:
-        ...
+    ) -> Iterator[OpenAPIValidationError]: ...
 
     def validate(
         self,
         instance: Schema,
         base_uri: str = "",
         spec_url: Optional[str] = None,
-    ) -> None:
-        ...
+    ) -> None: ...
diff --git a/openapi_spec_validator/validation/proxies.py b/openapi_spec_validator/validation/proxies.py
@@ -1,11 +1,9 @@
 """OpenAPI spec validator validation proxies module."""
+
 import warnings
-from collections.abc import Hashable
-from typing import Any
-from typing import Iterator
-from typing import Mapping
+from collections.abc import Iterator
+from collections.abc import Mapping
 from typing import Optional
-from typing import Tuple
 
 from jsonschema.exceptions import ValidationError
 from jsonschema_path.typing import Schema
@@ -59,7 +57,7 @@ def iter_errors(
 
 
 class DetectValidatorProxy:
-    def __init__(self, choices: Mapping[Tuple[str, str], SpecValidatorProxy]):
+    def __init__(self, choices: Mapping[tuple[str, str], SpecValidatorProxy]):
         self.choices = choices
 
     def detect(self, instance: Schema) -> SpecValidatorProxy:
diff --git a/openapi_spec_validator/validation/registries.py b/openapi_spec_validator/validation/registries.py
@@ -1,15 +1,14 @@
 from __future__ import annotations
 
+from collections.abc import Mapping
 from typing import DefaultDict
-from typing import Mapping
-from typing import Type
 
 from openapi_spec_validator.validation.keywords import KeywordValidator
 
 
 class KeywordValidatorRegistry(DefaultDict[str, KeywordValidator]):
     def __init__(
-        self, keyword_validators: Mapping[str, Type[KeywordValidator]]
+        self, keyword_validators: Mapping[str, type[KeywordValidator]]
     ):
         super().__init__()
         self.keyword_validators = keyword_validators
diff --git a/openapi_spec_validator/validation/types.py b/openapi_spec_validator/validation/types.py
@@ -1,5 +1,3 @@
-from typing import Type
-
 from openapi_spec_validator.validation.validators import SpecValidator
 
-SpecValidatorType = Type[SpecValidator]
+SpecValidatorType = type[SpecValidator]
diff --git a/openapi_spec_validator/validation/validators.py b/openapi_spec_validator/validation/validators.py
@@ -1,12 +1,11 @@
 """OpenAPI spec validator validation validators module."""
+
 import logging
 import warnings
+from collections.abc import Iterator
+from collections.abc import Mapping
 from functools import lru_cache
-from typing import Iterator
-from typing import List
-from typing import Mapping
 from typing import Optional
-from typing import Type
 from typing import cast
 
 from jsonschema.exceptions import ValidationError
@@ -31,10 +30,10 @@
 
 class SpecValidator:
     resolver_handlers = default_handlers
-    keyword_validators: Mapping[str, Type[keywords.KeywordValidator]] = {
+    keyword_validators: Mapping[str, type[keywords.KeywordValidator]] = {
         "__root__": keywords.RootValidator,
     }
-    root_keywords: List[str] = []
+    root_keywords: list[str] = []
     schema_validator: Validator = NotImplemented
 
     def __init__(
diff --git a/openapi_spec_validator/versions/consts.py b/openapi_spec_validator/versions/consts.py
@@ -1,5 +1,3 @@
-from typing import List
-
 from openapi_spec_validator.versions.datatypes import SpecVersion
 
 OPENAPIV2 = SpecVersion(
@@ -20,4 +18,4 @@
     minor="1",
 )
 
-VERSIONS: List[SpecVersion] = [OPENAPIV2, OPENAPIV30, OPENAPIV31]
+VERSIONS: list[SpecVersion] = [OPENAPIV2, OPENAPIV30, OPENAPIV31]
diff --git a/openapi_spec_validator/versions/finders.py b/openapi_spec_validator/versions/finders.py
diff --git a/tests/integration/validation/test_exceptions.py b/tests/integration/validation/test_exceptions.py
diff --git a/tests/integration/validation/test_validators.py b/tests/integration/validation/test_validators.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""OpenAPI spec validator module."""`
	`2`	`+`
`2`	`3`	`from openapi_spec_validator.shortcuts import validate`
`3`	`4`	`from openapi_spec_validator.shortcuts import validate_spec`
`4`	`5`	`from openapi_spec_validator.shortcuts import validate_spec_url`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""OpenAIP spec validator schemas module."""`
	`2`	`+`
`2`	`3`	`from functools import partial`
`3`	`4`
`4`	`5`	`from jsonschema.validators import Draft4Validator`