summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErovia <Erovia@users.noreply.github.com>2022-04-06 19:46:16 +0100
committerGitHub <noreply@github.com>2022-04-06 19:46:16 +0100
commit85de02057344fe48c9b88f43260165da100ecca7 (patch)
tree8a5d06e307e759f6b809bb40dc4fa0f51becc160
parentd8707164578790e7b4aed9767431013b6ded40cb (diff)
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
-rw-r--r--lib/python/qmk/json_schema.py6
-rw-r--r--requirements.txt2
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index 2b48782fbb..682346113e 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -68,7 +68,11 @@ def create_validator(schema):
68 schema_store = compile_schema_store() 68 schema_store = compile_schema_store()
69 resolver = jsonschema.RefResolver.from_schema(schema_store[schema], store=schema_store) 69 resolver = jsonschema.RefResolver.from_schema(schema_store[schema], store=schema_store)
70 70
71 return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate 71 # TODO: Remove this after the jsonschema>=4 requirement had time to reach users
72 try:
73 return jsonschema.Draft202012Validator(schema_store[schema], resolver=resolver).validate
74 except AttributeError:
75 return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
72 76
73 77
74def validate(data, schema): 78def validate(data, schema):
diff --git a/requirements.txt b/requirements.txt
index 92381d7d51..6d338ae1cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ argcomplete
4colorama 4colorama
5hid 5hid
6hjson 6hjson
7jsonschema>=3 7jsonschema>=4
8milc>=1.4.2 8milc>=1.4.2
9pygments 9pygments
10pyusb 10pyusb