Skip to content

Commit 1d66de7

Browse files
committed
Move to jsonschema-path
1 parent 45bbe0a commit 1d66de7

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

openapi_spec_validator/readers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from typing import Mapping
77
from typing import Tuple
88

9-
from jsonschema_spec.handlers import all_urls_handler
10-
from jsonschema_spec.handlers import file_handler
9+
from jsonschema_path.handlers import all_urls_handler
10+
from jsonschema_path.handlers import file_handler
1111

1212

1313
def read_from_stdin(filename: str) -> Tuple[Mapping[Hashable, Any], str]:

openapi_spec_validator/schemas/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from importlib_resources import as_file
1414
from importlib_resources import files
1515

16-
from jsonschema_spec.readers import FilePathReader
16+
from jsonschema_path.readers import FilePathReader
1717

1818

1919
def get_schema(version: str) -> Tuple[Mapping[Hashable, Any], str]:

openapi_spec_validator/shortcuts.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from typing import Optional
55
from typing import Type
66

7-
from jsonschema_spec.handlers import all_urls_handler
8-
from jsonschema_spec.typing import Schema
7+
from jsonschema_path.handlers import all_urls_handler
8+
from jsonschema_path.typing import Schema
99

1010
from openapi_spec_validator.validation import OpenAPIV2SpecValidator
1111
from openapi_spec_validator.validation import OpenAPIV30SpecValidator

openapi_spec_validator/validation/keywords.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from jsonschema._format import FormatChecker
1010
from jsonschema.exceptions import ValidationError
1111
from jsonschema.protocols import Validator
12-
from jsonschema_spec.paths import SchemaPath
12+
from jsonschema_path.paths import SchemaPath
1313
from openapi_schema_validator import oas30_format_checker
1414
from openapi_schema_validator import oas31_format_checker
1515
from openapi_schema_validator.validators import OAS30Validator

openapi_spec_validator/validation/proxies.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from typing import Tuple
99

1010
from jsonschema.exceptions import ValidationError
11-
from jsonschema_spec.typing import Schema
11+
from jsonschema_path.typing import Schema
1212

1313
from openapi_spec_validator.validation.exceptions import OpenAPIValidationError
1414
from openapi_spec_validator.validation.exceptions import ValidatorDetectError

openapi_spec_validator/validation/validators.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
from jsonschema.exceptions import ValidationError
1313
from jsonschema.protocols import Validator
14-
from jsonschema_spec.handlers import default_handlers
15-
from jsonschema_spec.paths import SchemaPath
16-
from jsonschema_spec.typing import Schema
14+
from jsonschema_path.handlers import default_handlers
15+
from jsonschema_path.paths import SchemaPath
16+
from jsonschema_path.typing import Schema
1717

1818
from openapi_spec_validator.schemas import openapi_v2_schema_validator
1919
from openapi_spec_validator.schemas import openapi_v30_schema_validator

openapi_spec_validator/versions/finders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from re import compile
22
from typing import List
33

4-
from jsonschema_spec.typing import Schema
4+
from jsonschema_path.typing import Schema
55

66
from openapi_spec_validator.versions.datatypes import SpecVersion
77
from openapi_spec_validator.versions.exceptions import OpenAPIVersionNotFound

openapi_spec_validator/versions/shortcuts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from jsonschema_spec.typing import Schema
1+
from jsonschema_path.typing import Schema
22

33
from openapi_spec_validator.versions.consts import VERSIONS
44
from openapi_spec_validator.versions.datatypes import SpecVersion

poetry.lock

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jsonschema = "^4.18.0"
5656
openapi-schema-validator = "^0.6.0"
5757
python = "^3.8.0"
5858
importlib-resources = {version = ">=5.8,<7.0", python = "<3.9" }
59-
jsonschema-spec = "^0.2.3"
59+
jsonschema-path = "^0.3.0"
6060
lazy-object-proxy = "^1.7.1"
6161

6262
[tool.poetry.extras]

tests/integration/conftest.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from urllib.parse import urlunparse
44

55
import pytest
6-
from jsonschema_spec.handlers.file import FilePathHandler
7-
from jsonschema_spec.handlers.urllib import UrllibHandler
6+
from jsonschema_path.handlers.file import FilePathHandler
7+
from jsonschema_path.handlers.urllib import UrllibHandler
88

99

1010
def spec_file_url(spec_file, schema="file"):

0 commit comments

Comments
 (0)