Merge branch 'master' into feature/bump_release_version_in_pre-commit_readme_example

Author: p1c2u

.bumpversion.cfg

@@ -11,10 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.12
 
       - name: Get full Python version
         id: full-python-version
@@ -44,7 +44,7 @@ jobs:
         run: |
           poetry run python -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs docs/_build/html -n -W
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload docs as artifact
         with:
           name: docs-html

.github/workflows/build-docs.yml

@@ -12,22 +12,23 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
       - name: Set up poetry
-        uses: Gr1N/setup-poetry@v8
+        uses: Gr1N/setup-poetry@v9
 
       - name: Build
         run: poetry build
 
       - name: Publish
-        env:
-          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: poetry publish
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: dist/

.github/workflows/python-publish.yml

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

.github/workflows/python-test.yml

@@ -1,6 +1,6 @@
-ARG OPENAPI_SPEC_VALIDATOR_VERSION=0.7.1
+ARG OPENAPI_SPEC_VALIDATOR_VERSION=0.7.2
 
-FROM python:3.12.6-alpine as builder
+FROM python:3.13.4-alpine as builder
 
 ARG OPENAPI_SPEC_VALIDATOR_VERSION
 
@@ -9,7 +9,7 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN apk add --no-cache cargo
 RUN python -m pip wheel --wheel-dir /wheels openapi-spec-validator==${OPENAPI_SPEC_VALIDATOR_VERSION}
 
-FROM python:3.12.6-alpine
+FROM python:3.13.4-alpine
 
 ARG OPENAPI_SPEC_VALIDATOR_VERSION
 

Dockerfile

@@ -14,7 +14,7 @@
 
 __author__ = "Artur Maciag"
 __email__ = "maciag.artur@gmail.com"
-__version__ = "0.7.1"
+__version__ = "0.7.2"
 __url__ = "https://github.com/python-openapi/openapi-spec-validator"
 __license__ = "Apache License, Version 2.0"
 

openapi_spec_validator/__init__.py

@@ -1,8 +1,8 @@
 import sys
+from collections.abc import Hashable
 from os import path
 from pathlib import Path
 from typing import Any
-from typing import Hashable
 from typing import Mapping
 from typing import Tuple
 

openapi_spec_validator/readers.py

@@ -1,18 +1,12 @@
 """OpenAIP spec validator schemas utils module."""
-import sys
+from collections.abc import Hashable
+from importlib.resources import as_file
+from importlib.resources import files
 from os import path
 from typing import Any
-from typing import Hashable
 from typing import Mapping
 from typing import Tuple
 
-if sys.version_info >= (3, 9):
-    from importlib.resources import as_file
-    from importlib.resources import files
-else:
-    from importlib_resources import as_file
-    from importlib_resources import files
-
 from jsonschema_path.readers import FilePathReader
 
 

openapi_spec_validator/schemas/utils.py

@@ -73,6 +73,26 @@ def __init__(self, registry: "KeywordValidatorRegistry"):
     def default_validator(self) -> ValueValidator:
         return cast(ValueValidator, self.registry["default"])
 
+    def _collect_properties(self, schema: SchemaPath) -> set[str]:
+        """Return *all* property names reachable from this schema."""
+        props: set[str] = set()
+
+        if "properties" in schema:
+            props.update((schema / "properties").keys())
+
+        for kw in ("allOf", "anyOf", "oneOf"):
+            if kw in schema:
+                for sub in schema / kw:
+                    props.update(self._collect_properties(sub))
+
+        if "items" in schema:
+            props.update(self._collect_properties(schema / "items"))
+
+        if "not" in schema:
+            props.update(self._collect_properties(schema / "not"))
+
+        return props
+
     def __call__(
         self, schema: SchemaPath, require_properties: bool = True
     ) -> Iterator[ValidationError]:
@@ -89,15 +109,9 @@ def __call__(
         if "allOf" in schema:
             all_of = schema / "allOf"
             for inner_schema in all_of:
-                yield from self(
-                    inner_schema,
-                    require_properties=False,
-                )
-                if "properties" not in inner_schema:
-                    continue
-                inner_schema_props = inner_schema / "properties"
-                inner_schema_props_keys = inner_schema_props.keys()
-                nested_properties += list(inner_schema_props_keys)
+                yield from self(inner_schema, require_properties=False)
+                nested_properties += list(self._collect_properties(inner_schema))
+
 
         if "anyOf" in schema:
             any_of = schema / "anyOf"

openapi_spec_validator/validation/keywords.py

@@ -1,7 +1,7 @@
 """OpenAPI spec validator validation proxies module."""
 import warnings
+from collections.abc import Hashable
 from typing import Any
-from typing import Hashable
 from typing import Iterator
 from typing import Mapping
 from typing import Optional