Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLI: Bump the 'jsonschema' version #16635

Merged
merged 2 commits into from
Apr 6, 2022
Merged

CLI: Bump the 'jsonschema' version #16635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e73b50f
CLI: Bump the 'jsonschema' version
Erovia Mar 13, 2022
2efe13f
Fix formatting
Erovia Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/python/qmk/json_schema.py
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ argcomplete
colorama
hid
hjson
jsonschema>=3
jsonschema>=4
zvecr marked this conversation as resolved.
Show resolved Hide resolved
milc>=1.4.2
pygments
pyusb
Expand Down