Skip to content

Commit

Permalink
CLI: Bump the 'jsonschema' version (qmk#16635)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Erovia authored Apr 6, 2022
1 parent d870716 commit 85de020
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion lib/python/qmk/json_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ argcomplete
colorama
hid
hjson
jsonschema>=3
jsonschema>=4
milc>=1.4.2
pygments
pyusb
Expand Down

0 comments on commit 85de020

Please sign in to comment.