Merge pull request #133 from OpenDataServices/2023-10-10

Drop support for jsonschema 3
OpenDataServices · Oct 12, 2023 · 5fe6465 · 5fe6465
2 parents 1144268 + 06cb1c0
commit 5fe6465
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Removed
 
 - Dropped support for Python 3.6 & 3.7, as these are now end of life.
+- Drop jsonschema 3 support
 
 ## [0.31.0] - 2023-07-06
 

diff --git a/libcove/lib/common.py b/libcove/lib/common.py
@@ -235,7 +235,9 @@ def oneOf_draft4(validator, oneOf, instance, schema):
                 context=all_errors,
             )
 
-    more_valid = [s for i, s in subschemas if validator.is_valid(instance, s)]
+    more_valid = [
+        s for i, s in subschemas if validator.evolve(schema=s).is_valid(instance)
+    ]
     if more_valid:
         more_valid.append(first_valid)
         reprs = ", ".join(repr(schema) for schema in more_valid)

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     long_description="A data review library",
     install_requires=[
         "jsonref",
-        "jsonschema>=3",
+        "jsonschema>=4",
         "requests",
         "cached-property;python_version<'3.8'",
         "flattentool>=0.11.0",