ruff16

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
       - id: pycln
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.15.13
+    rev: v0.16.5
     hooks:
       # Run the linter.
       - id: ruff-check
@@ -62,7 +62,7 @@ repos:
 
   - repo: https://github.com/astral-sh/uv-pre-commit
     # uv version.
-    rev: 0.11.15
+    rev: 0.12.8
     hooks:
       # Update the uv lockfile
       - id: uv-lock

docs/source/_ext/aioai3.py

@@ -1,7 +1,8 @@
-from sphinx.domains import Domain
-from sphinx.roles import XRefRole
+from typing import ClassVar
 
 from docutils import nodes
+from sphinx.domains import Domain
+from sphinx.roles import XRefRole
 
 
 def resolve_url(env, name):
@@ -15,7 +16,7 @@ class aiopenapi3Domain(Domain):
     name = "aioai3"
     label = "aiopenapi3 code linker"
 
-    roles = {
+    roles: ClassVar = {
         "ref": XRefRole(),
     }
 

docs/source/conf.py

@@ -6,13 +6,12 @@
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
-import os
+import datetime
 import importlib
 import inspect
-from pathlib import Path
+import os
 import sys
-import datetime
-
+from pathlib import Path
 
 sys.path.append(str(p := (Path(".").absolute() / "_ext")))
 assert p.exists(), f"{p} {os.getcwd()}"
@@ -26,7 +25,7 @@
 """
 
 project = "aiopenapi3"
-copyright = f"{datetime.datetime.now().date().year}, Markus Kötter"
+copyright = f"{datetime.datetime.now().date().year}, Markus Kötter"  # noqa: DTZ005
 author = "Markus Kötter"
 
 # -- General configuration ---------------------------------------------------

pyproject.toml

@@ -81,7 +81,14 @@ indent-width = 4
 
 [tool.ruff.lint]
 fixable = ["ALL"]
-ignore = ["E741","F841","E402"]
+ignore = [
+    "E741", # ambiguous-variable-name
+    "F841", # unused-variable
+]
+
+[tool.ruff.lint.per-file-ignores]
+"src/aiopenapi3/model.py" = ["UP007"] # https://github.com/astral-sh/ruff/issues/21347
+"tests/parsing_test.py" = ["UP007"]
 
 [tool.ruff.format]
 quote-style = "double"

src/aiopenapi3/__init__.py

@@ -1,30 +1,29 @@
-from .version import __version__
-from .openapi import OpenAPI
-from .loader import FileSystemLoader
 from .errors import (
-    SpecError,
-    ReferenceResolutionError,
+    ContentTypeError,
     HTTPError,
-    ResponseError,
     HTTPStatusError,
-    ContentTypeError,
+    ReferenceResolutionError,
+    RequestError,
     ResponseDecodingError,
+    ResponseError,
     ResponseSchemaError,
-    RequestError,
+    SpecError,
 )
-
+from .loader import FileSystemLoader
+from .openapi import OpenAPI
+from .version import __version__
 
 __all__ = [
-    "__version__",
-    "OpenAPI",
+    "ContentTypeError",
     "FileSystemLoader",
-    "SpecError",
-    "ReferenceResolutionError",
     "HTTPError",
-    "ResponseError",
     "HTTPStatusError",
-    "ContentTypeError",
+    "OpenAPI",
+    "ReferenceResolutionError",
+    "RequestError",
     "ResponseDecodingError",
+    "ResponseError",
     "ResponseSchemaError",
-    "RequestError",
+    "SpecError",
+    "__version__",
 ]

src/aiopenapi3/__main__.py

@@ -1,4 +1,5 @@
 import sys
+
 from .cli import main
 
 if __name__ == "__main__":

src/aiopenapi3/_types.py

@@ -1,87 +1,79 @@
 import re
-from typing import TYPE_CHECKING, Union, TypeAlias, Optional, Literal
 from collections.abc import Sequence
+from typing import Literal, TypeAlias
 
 import yaml
-
-from httpx._types import RequestContent, FileTypes, RequestFiles, AuthTypes  # noqa
+from httpx2._types import AuthTypes, FileTypes, RequestContent, RequestFiles
 from pydantic import BaseModel
 
-
 from . import v20, v30, v31, v32
 
-if TYPE_CHECKING:
-    pass
-
-
 RequestFileParameter = tuple[str, FileTypes]
 RequestFilesParameter = Sequence[RequestFileParameter]
 
-JSON: TypeAlias = Optional[Union[dict[str, "JSON"], list["JSON"], str, int, float, bool]]
+JSON: TypeAlias = dict[str, "JSON"] | list["JSON"] | str | int | float | bool | None
 """
 Define a JSON type
 https://github.com/python/typing/issues/182#issuecomment-1320974824
 """
 
-RequestData = Union[JSON, BaseModel, RequestFilesParameter]
-RequestParameter = Union[str, BaseModel]
+RequestData = JSON | BaseModel | RequestFilesParameter
+RequestParameter = str | BaseModel
 RequestParameters = dict[str, RequestParameter]
 
-RootType = Union[v20.Root, v30.Root, v31.Root]
-ServerType = Union[v30.Server, v31.Server]
-ReferenceType = Union[v20.Reference, v30.Reference, v31.Reference]
-SchemaType = Union[v20.Schema, v30.Schema, v31.Schema]
-v3xSchemaType = Union[v30.Schema, v31.Schema]
-DiscriminatorType = Union[v30.Discriminator, v31.Discriminator]
-PathItemType = Union[v20.PathItem, v30.PathItem, v31.PathItem]
-OperationType = Union[v20.Operation, v30.Operation, v31.Operation]
-ParameterType = Union[v20.Parameter, v30.Parameter, v31.Parameter]
-HeaderType = Union[v20.Header, v30.Header, v31.Header]
-RequestType = Union[v20.Request, v30.Request]
-AsyncRequestType = Union[v20.AsyncRequest, v30.AsyncRequest]
-MediaTypeType = Union[v30.MediaType, v31.MediaType]
-ExpectedType = Union[v20.Response, MediaTypeType]
-ResponseHeadersType = dict[str, Union[str, BaseModel, list[BaseModel]]]
-ResponseDataType = Union[BaseModel, bytes, str]
-TagType = Union[v20.Tag, v30.Tag, v32.Tag]
+RootType = v20.Root | v30.Root | v31.Root
+ServerType = v30.Server | v31.Server
+ReferenceType = v20.Reference | v30.Reference | v31.Reference
+SchemaType = v20.Schema | v30.Schema | v31.Schema
+v3xSchemaType = v30.Schema | v31.Schema
+DiscriminatorType = v30.Discriminator | v31.Discriminator
+PathItemType = v20.PathItem, v30.PathItem | v31.PathItem
+OperationType = v20.Operation | v30.Operation | v31.Operation
+ParameterType = v20.Parameter | v30.Parameter | v31.Parameter
+HeaderType = v20.Header | v30.Header | v31.Header
+RequestType = v20.Request | v30.Request
+AsyncRequestType = v20.AsyncRequest | v30.AsyncRequest
+MediaTypeType = v30.MediaType | v31.MediaType
+ExpectedType = v20.Response | MediaTypeType
+ResponseHeadersType = dict[str, str | BaseModel | list[BaseModel]]
+ResponseDataType = BaseModel, bytes | str
+TagType = v20.Tag | v30.Tag | v32.Tag
 
-YAMLLoaderType = Union[type[yaml.Loader], type[yaml.CLoader], type[yaml.SafeLoader], type[yaml.CSafeLoader]]
+YAMLLoaderType = type[yaml.Loader] | type[yaml.CLoader] | type[yaml.SafeLoader] | type[yaml.CSafeLoader]
 
-PrimitiveTypes = Union[str, float, int, bool]
+PrimitiveTypes = str | float | int | bool
 
 HTTPMethodType = Literal["get", "put", "post", "delete", "options", "head", "patch", "trace"]
-HTTPMethodMatchType = Union[re.Pattern, HTTPMethodType]
+HTTPMethodMatchType = re.Pattern | HTTPMethodType
 
 __all__: list[str] = [
-    "RootType",
-    "ServerType",
-    "SchemaType",
-    "v3xSchemaType",
+    "JSON",
+    "AuthTypes",
     "DiscriminatorType",
-    "PathItemType",
-    "OperationType",
-    "ParameterType",
-    "HeaderType",
-    "RequestType",
     "ExpectedType",
+    "HTTPMethodMatchType",
+    "HTTPMethodType",
+    "HeaderType",
     "MediaTypeType",
-    "ResponseHeadersType",
-    "ResponseDataType",
-    "TagType",
-    "RequestData",
-    "RequestParameters",
-    "ReferenceType",
+    "OperationType",
+    "ParameterType",
+    "PathItemType",
     "PrimitiveTypes",
-    #
-    "YAMLLoaderType",
+    "ReferenceType",
     # httpx forwards
     "RequestContent",
+    "RequestData",
+    "RequestFileParameter",
     "RequestFiles",
-    "AuthTypes",
-    #
-    "JSON",
     "RequestFilesParameter",
-    "RequestFileParameter",
-    "HTTPMethodType",
-    "HTTPMethodMatchType",
+    "RequestParameters",
+    "RequestType",
+    "ResponseDataType",
+    "ResponseHeadersType",
+    "RootType",
+    "SchemaType",
+    "ServerType",
+    "TagType",
+    "YAMLLoaderType",
+    "v3xSchemaType",
 ]