Selaa lähdekoodia

CLI: Bump the 'jsonschema' version (#16635)

* CLI: Bump the 'jsonschema' version

Update the used meta-schema from Draft 7 from 2018 to the latest one,
Draft 2020-12.
Currently, the validator falls back to Draft 7 if the newer validator is
not available. Draft 2020-12 support was introduced to 'jsonschema' in
version 4.0.0.

* Fix formatting
Erovia 3 vuotta sitten
vanhempi
commit
85de020573
2 muutettua tiedostoa jossa 6 lisäystä ja 2 poistoa
  1. 5 1
      lib/python/qmk/json_schema.py
  2. 1 1
      requirements.txt

+ 5 - 1
lib/python/qmk/json_schema.py

@@ -68,7 +68,11 @@ def create_validator(schema):
     schema_store = compile_schema_store()
     resolver = jsonschema.RefResolver.from_schema(schema_store[schema], store=schema_store)
 
-    return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
+    # TODO: Remove this after the jsonschema>=4 requirement had time to reach users
+    try:
+        return jsonschema.Draft202012Validator(schema_store[schema], resolver=resolver).validate
+    except AttributeError:
+        return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
 
 
 def validate(data, schema):

+ 1 - 1
requirements.txt

@@ -4,7 +4,7 @@ argcomplete
 colorama
 hid
 hjson
-jsonschema>=3
+jsonschema>=4
 milc>=1.4.2
 pygments
 pyusb