fix: Force jsonschema to use our validator

[jpmckinney]

Otherwise, jsonschema switches back to the default Draft4Validator: python-jsonschema/jsonschema#994 This code seems to be the recommended solution, per that issue.

There are some whitespace changes because black was complaining about the lint workflow.

---

I also tried the following patch, but extend, doesn't seem to behave as documented. (The validators argument doesn't cause the validators to be overridden for $referenced schema.)

Note that, even if the below diff were to work, some lib-cove-* libraries (like lib-cove-ocds) override validator.VALIDATORS directly (which is not part of jsonschema's public API).

Allowing such overrides while following jsonschema's public API would require more significant refactoring in lib-cove.

diff --git a/libcove/lib/common.py b/libcove/lib/common.py
index f5c508b..6568b2f 100644
--- a/libcove/lib/common.py
+++ b/libcove/lib/common.py
@@ -92,17 +92,6 @@ class TypeChecker:
         raise UndefinedTypeCheck(type)
 
 
-# Because we will be changing items on this validator, it's important we take a copy!
-# Otherwise we could cause conflicts with other software in the same process.
-validator = jsonschema.validators.extend(
-    jsonschema.validators.Draft4Validator,
-    validators={
-        "type": type_validator,
-    },
-    type_checker=TypeChecker(),
-)
-
-uniqueItemsValidator = validator.VALIDATORS.pop("uniqueItems")
 LANGUAGE_RE = re.compile(
     "^(.*_(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)))$"
 )
@@ -345,13 +334,23 @@ def dependencies_extra_data(validator, dependencies, instance, schema):
                 yield error
 
 
-validator.VALIDATORS.pop("patternProperties")
-validator.VALIDATORS["uniqueItems"] = unique_ids
-validator.VALIDATORS["required"] = required_draft4
-validator.VALIDATORS["oneOf"] = oneOf_draft4
-validator.VALIDATORS["dependencies"] = dependencies_extra_data
-validator.VALIDATORS["additionalItems"] = additionalItems_extra_data
-validator.VALIDATORS["additionalProperties"] = additionalProperties_extra_data
+
+# Because we will be changing items on this validator, it's important we take a copy!
+# Otherwise we could cause conflicts with other software in the same process.
+validator = jsonschema.validators.extend(
+    jsonschema.validators.Draft4Validator,
+    validators={
+        "type": type_validator,
+        "required": required_draft4,
+        "oneOf": oneOf_draft4,
+        "dependencies": dependencies_extra_data,
+        "additionalItems": additionalItems_extra_data,
+        "additionalProperties": additionalProperties_extra_data,
+        "patternProperties": lambda *args, **kwargs: None,
+        "uniqueItems": lambda *args, **kwargs: None,
+    },
+    type_checker=TypeChecker(),
+)
 
 
 # Properties this class might look for

[Bjwebb]

Merged in #122