Merge pull request #72 from python-openapi/feature/jsonschem-4.18-compatibility

jsonschema 4.18 compatibility

Author: p1c2u

openapi_schema_validator/_validators.py

@@ -53,7 +53,7 @@ def handle_discriminator(
         return
 
     try:
-        validator.resolver.resolve(ref)
+        validator._validate_reference(ref=ref, instance=instance)
     except:
         yield ValidationError(
             f"{instance!r} reference {ref!r} could not be resolved",

openapi_schema_validator/validators.py

@@ -3,20 +3,21 @@
 from typing import Type
 
 from jsonschema import _legacy_validators
-from jsonschema import _utils
 from jsonschema import _validators
-from jsonschema.protocols import Validator
 from jsonschema.validators import Draft202012Validator
 from jsonschema.validators import create
 from jsonschema.validators import extend
+from jsonschema_specifications import REGISTRY as SPECIFICATIONS
 
 from openapi_schema_validator import _format as oas_format
 from openapi_schema_validator import _types as oas_types
 from openapi_schema_validator import _validators as oas_validators
 from openapi_schema_validator._types import oas31_type_checker
 
 OAS30Validator = create(
-    meta_schema=_utils.load_schema("draft4"),
+    meta_schema=SPECIFICATIONS.contents(
+        "http://json-schema.org/draft-04/schema#",
+    ),
     validators={
         "multipleOf": _validators.multipleOf,
         # exclusiveMaximum supported inside maximum_draft3_draft4

poetry.lock

@@ -20,6 +20,10 @@ strict = true
 module = "jsonschema.*"
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = "jsonschema_specifications"
+ignore_missing_imports = true
+
 [[tool.mypy.overrides]]
 module = "rfc3339_validator"
 ignore_missing_imports = true
@@ -51,8 +55,9 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.8.0"
-jsonschema = ">=4.0.0,<4.18.0"
+jsonschema = {version = "^4.18.0a1", allow-prereleases = true}
 rfc3339-validator = "*" # requred by jsonschema for date-time checker
+jsonschema-specifications = "^2023.5.2"
 
 [tool.poetry.extras]
 docs = ["sphinx", "sphinx-immaterial"]