Merge pull request #1185 from WilliamJamieson/feature/validator

CHANGES.rst

@@ -6,6 +6,7 @@
 - Add `asdf.search.AsdfSearchResult` support for `~asdf.AsdfFile.schema_info` and
   `~asdf.search.AsdfSearchResult.schema_info` method. [#1197]
 - Use forc ndarray flag to correctly test for fortran array contiguity [#1206]
+- Unpin ``jsonschema`` version and fix ``jsonschema`` deprecation warnings. [#1185]
 
 2.13.0 (2022-08-19)
 -------------------

asdf/schema.py

@@ -7,7 +7,6 @@
 from functools import lru_cache
 from numbers import Integral
 
-import attr
 import numpy as np
 import yaml
 from jsonschema import validators as mvalidators
@@ -253,15 +252,25 @@ def _create_validator(validators=YAML_VALIDATORS, visit_repeat_nodes=False):
         }
     )
     id_of = mvalidators.Draft4Validator.ID_OF
-    base_cls = mvalidators.create(
+    ASDFValidator = mvalidators.create(
         meta_schema=meta_schema, validators=validators, type_checker=type_checker, id_of=id_of
     )
 
-    @attr.s
-    class ASDFValidator(base_cls):
-        _context = attr.ib(factory=lambda: _ValidationContext())
-        ctx = attr.ib(default=None)
-        serialization_context = attr.ib(default=None)
+    def _patch_init(cls):
+        original_init = cls.__init__
+
+        def __init__(self, *args, **kwargs):
+            self.ctx = kwargs.pop("ctx", None)
+            self.serialization_context = kwargs.pop("serialization_context", None)
+
+            original_init(self, *args, **kwargs)
+
+        cls.__init__ = __init__
+
+    def _patch_iter_errors(cls):
+        original_iter_errors = cls.iter_errors
+
+        cls._context = _ValidationContext()
 
         def iter_errors(self, instance, *args, **kwargs):
             # We can't validate anything that looks like an external reference,
@@ -308,7 +317,12 @@ def iter_errors(self, instance, *args, **kwargs):
                         for val in instance:
                             yield from self.iter_errors(val)
                 else:
-                    yield from super().iter_errors(instance)
+                    yield from original_iter_errors(self, instance)
+
+        cls.iter_errors = iter_errors
+
+    _patch_init(ASDFValidator)
+    _patch_iter_errors(ASDFValidator)
 
     return ASDFValidator
 

asdf/tests/test_schema.py

@@ -410,6 +410,7 @@ def test_defaults():
     assert t == {}
 
 
+@pytest.mark.xfail(reason="This will be fixed by #1203")
 def test_default_check_in_schema():
     s = {"type": "object", "properties": {"a": {"type": "integer", "default": "foo"}}}
 
@@ -419,6 +420,7 @@ def test_default_check_in_schema():
     schema.check_schema(s, validate_default=False)
 
 
+@pytest.mark.xfail(reason="This will be fixed by #1203")
 def test_check_complex_default():
     default_software = tagged.TaggedDict({"name": "asdf", "version": "2.7.0"}, "tag:stsci.edu/asdf/core/software-1.0.0")
 

docs/asdf/config.rst

@@ -151,7 +151,7 @@ a schema, which can then be used to validate a file:
     ... type: object
     ... properties:
     ...   foo:
-    ...   type: string
+    ...     type: string
     ... required: [foo]
     ... ...
     ... """

pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     'asdf-transform-schemas >=0.2.2',
     'importlib_resources >=3; python_version <"3.9"',
     'jmespath >=0.6.2',
-    'jsonschema >=4.0.1, <4.10.0',
+    'jsonschema >=4.0.1',
     'numpy >=1.10',
     'packaging >=16.0',
     'pyyaml >=3.10',