~ruther/qmk_firmware: CLI: Bump the 'jsonschema' version (#16635)

85de02057344fe48c9b88f43260165da100ecca7 — Erovia 3 years ago d870716

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

patch browse .tar.gz

2 files changed, 6 insertions(+), 2 deletions(-)

M lib/python/qmk/json_schema.py
M requirements.txt

M lib/python/qmk/json_schema.py => lib/python/qmk/json_schema.py +5 -1

@@ 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):

M requirements.txt => requirements.txt +1 -1

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