locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Erovia 2022-04-06 19:46:16 +01:00 committed by GitHub
parent d870716457
commit 85de020573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/python/qmk/json_schema.py
View File

@ -68,7 +68,11 @@ def create_validator(schema):
schema_store = compile_schema_store() schema_store = compile_schema_store()
resolver = jsonschema.RefResolver.from_schema(schema_store[schema], store=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): def validate(data, schema):

2
requirements.txt
View File

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