Content-Length: 7966 | pFad | http://github.com/python-openapi/openapi-spec-validator/pull/292.patch

thub.com From 1d66de73d5226ea0a0ce6a6664a0bbe414fe2cca Mon Sep 17 00:00:00 2001 From: p1c2u Date: Fri, 13 Oct 2023 08:50:25 +0000 Subject: [PATCH] Move to jsonschema-path --- openapi_spec_validator/readers.py | 4 ++-- openapi_spec_validator/schemas/utils.py | 2 +- openapi_spec_validator/shortcuts.py | 4 ++-- openapi_spec_validator/validation/keywords.py | 2 +- openapi_spec_validator/validation/proxies.py | 2 +- openapi_spec_validator/validation/validators.py | 6 +++--- openapi_spec_validator/versions/finders.py | 2 +- openapi_spec_validator/versions/shortcuts.py | 2 +- poetry.lock | 10 +++++----- pyproject.toml | 2 +- tests/integration/conftest.py | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/openapi_spec_validator/readers.py b/openapi_spec_validator/readers.py index cd1803e..9f9d93c 100644 --- a/openapi_spec_validator/readers.py +++ b/openapi_spec_validator/readers.py @@ -6,8 +6,8 @@ from typing import Mapping from typing import Tuple -from jsonschema_spec.handlers import all_urls_handler -from jsonschema_spec.handlers import file_handler +from jsonschema_path.handlers import all_urls_handler +from jsonschema_path.handlers import file_handler def read_from_stdin(filename: str) -> Tuple[Mapping[Hashable, Any], str]: diff --git a/openapi_spec_validator/schemas/utils.py b/openapi_spec_validator/schemas/utils.py index 30c99a1..37a7494 100644 --- a/openapi_spec_validator/schemas/utils.py +++ b/openapi_spec_validator/schemas/utils.py @@ -13,7 +13,7 @@ from importlib_resources import as_file from importlib_resources import files -from jsonschema_spec.readers import FilePathReader +from jsonschema_path.readers import FilePathReader def get_schema(version: str) -> Tuple[Mapping[Hashable, Any], str]: diff --git a/openapi_spec_validator/shortcuts.py b/openapi_spec_validator/shortcuts.py index 9921d9d..fed70fd 100644 --- a/openapi_spec_validator/shortcuts.py +++ b/openapi_spec_validator/shortcuts.py @@ -4,8 +4,8 @@ from typing import Optional from typing import Type -from jsonschema_spec.handlers import all_urls_handler -from jsonschema_spec.typing import Schema +from jsonschema_path.handlers import all_urls_handler +from jsonschema_path.typing import Schema from openapi_spec_validator.validation import OpenAPIV2SpecValidator from openapi_spec_validator.validation import OpenAPIV30SpecValidator diff --git a/openapi_spec_validator/validation/keywords.py b/openapi_spec_validator/validation/keywords.py index 125d3ad..081a0ec 100644 --- a/openapi_spec_validator/validation/keywords.py +++ b/openapi_spec_validator/validation/keywords.py @@ -9,7 +9,7 @@ from jsonschema._format import FormatChecker from jsonschema.exceptions import ValidationError from jsonschema.protocols import Validator -from jsonschema_spec.paths import SchemaPath +from jsonschema_path.paths import SchemaPath from openapi_schema_validator import oas30_format_checker from openapi_schema_validator import oas31_format_checker from openapi_schema_validator.validators import OAS30Validator diff --git a/openapi_spec_validator/validation/proxies.py b/openapi_spec_validator/validation/proxies.py index 1ab7185..d872620 100644 --- a/openapi_spec_validator/validation/proxies.py +++ b/openapi_spec_validator/validation/proxies.py @@ -8,7 +8,7 @@ from typing import Tuple from jsonschema.exceptions import ValidationError -from jsonschema_spec.typing import Schema +from jsonschema_path.typing import Schema from openapi_spec_validator.validation.exceptions import OpenAPIValidationError from openapi_spec_validator.validation.exceptions import ValidatorDetectError diff --git a/openapi_spec_validator/validation/validators.py b/openapi_spec_validator/validation/validators.py index a789d16..dbfd8ea 100644 --- a/openapi_spec_validator/validation/validators.py +++ b/openapi_spec_validator/validation/validators.py @@ -11,9 +11,9 @@ from jsonschema.exceptions import ValidationError from jsonschema.protocols import Validator -from jsonschema_spec.handlers import default_handlers -from jsonschema_spec.paths import SchemaPath -from jsonschema_spec.typing import Schema +from jsonschema_path.handlers import default_handlers +from jsonschema_path.paths import SchemaPath +from jsonschema_path.typing import Schema from openapi_spec_validator.schemas import openapi_v2_schema_validator from openapi_spec_validator.schemas import openapi_v30_schema_validator diff --git a/openapi_spec_validator/versions/finders.py b/openapi_spec_validator/versions/finders.py index f8b1ddc..803cabc 100644 --- a/openapi_spec_validator/versions/finders.py +++ b/openapi_spec_validator/versions/finders.py @@ -1,7 +1,7 @@ from re import compile from typing import List -from jsonschema_spec.typing import Schema +from jsonschema_path.typing import Schema from openapi_spec_validator.versions.datatypes import SpecVersion from openapi_spec_validator.versions.exceptions import OpenAPIVersionNotFound diff --git a/openapi_spec_validator/versions/shortcuts.py b/openapi_spec_validator/versions/shortcuts.py index 73841e9..1ff16bf 100644 --- a/openapi_spec_validator/versions/shortcuts.py +++ b/openapi_spec_validator/versions/shortcuts.py @@ -1,4 +1,4 @@ -from jsonschema_spec.typing import Schema +from jsonschema_path.typing import Schema from openapi_spec_validator.versions.consts import VERSIONS from openapi_spec_validator.versions.datatypes import SpecVersion diff --git a/poetry.lock b/poetry.lock index e28d9c9..8daf93d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -612,14 +612,14 @@ format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validat format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"] [[package]] -name = "jsonschema-spec" -version = "0.2.4" +name = "jsonschema-path" +version = "0.3.0" description = "JSONSchema Spec with object-oriented paths" optional = false python-versions = ">=3.8.0,<4.0.0" files = [ - {file = "jsonschema_spec-0.2.4-py3-none-any.whl", hash = "sha256:e6dcf7056734ec6854f7888da6c08ce6c421f28aeeddce96bb90de0fb6d711ef"}, - {file = "jsonschema_spec-0.2.4.tar.gz", hash = "sha256:873e396ad1ba6edf9f52d6174c110d4fafb7b5f5894744246a53fe75e5251ec2"}, + {file = "jsonschema_path-0.3.0-py3-none-any.whl", hash = "sha256:f165924e5f61e8d6633fdd5a620620b1c1271e81c7592286357e54e2ceeecf77"}, + {file = "jsonschema_path-0.3.0.tar.gz", hash = "sha256:4b2791105ec16e47e5d89c0d08220d3049b9e6dd735fc2e07a0132f5d6b769c7"}, ] [package.dependencies] @@ -1728,4 +1728,4 @@ docs = [] [metadata] lock-version = "2.0" python-versions = "^3.8.0" -content-hash = "b1f1adf7c0de23deb21f8ecd075c0c100c3f0ac8450039ec4c20385ac7a44c3f" +content-hash = "0933a35821428ee7eb09dd3d77c2762a283c6e5fec5786d4bedbdfddd26c621c" diff --git a/pyproject.toml b/pyproject.toml index 6403d70..4163fe7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ jsonschema = "^4.18.0" openapi-schema-validator = "^0.6.0" python = "^3.8.0" importlib-resources = {version = ">=5.8,<7.0", python = "<3.9" } -jsonschema-spec = "^0.2.3" +jsonschema-path = "^0.3.0" lazy-object-proxy = "^1.7.1" [tool.poetry.extras] diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 4f3cc08..a420f6d 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -3,8 +3,8 @@ from urllib.parse import urlunparse import pytest -from jsonschema_spec.handlers.file import FilePathHandler -from jsonschema_spec.handlers.urllib import UrllibHandler +from jsonschema_path.handlers.file import FilePathHandler +from jsonschema_path.handlers.urllib import UrllibHandler def spec_file_url(spec_file, schema="file"):

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!