ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make our schema validation more compact and flexible

Browse source
This commit is contained in:
Zach White 2021-06-21 12:30:26 -07:00
parent 846da06380
commit 6d20b28354
3 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/python/qmk/info.py
View file

@ -9,7 +9,7 @@ from milc import cli
from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS
from qmk.c_parse import find_layouts
from qmk.json_schema import deep_update, json_load, keyboard_validate, keyboard_api_validate
from qmk.json_schema import deep_update, json_load, validate
from qmk.keyboard import config_h, rules_mk
from qmk.keymap import list_keymaps
from qmk.makefile import parse_rules_mk_file
@ -66,7 +66,7 @@ def info_json(keyboard):
# Validate against the jsonschema
try:
keyboard_api_validate(info_data)
validate(info_data, 'qmk.api.keyboard.v1')
except jsonschema.ValidationError as e:
json_path = '.'.join([str(p) for p in e.absolute_path])
@ -496,7 +496,7 @@ def merge_info_jsons(keyboard, info_data):
continue
try:
keyboard_validate(new_info_data)
validate(new_info_data, 'qmk.keyboard.v1')
except jsonschema.ValidationError as e:
json_path = '.'.join([str(p) for p in e.absolute_path])
cli.log.error('Not including data from file: %s', info_file)