diff options
author | QMK Bot <hello@qmk.fm> | 2021-03-24 16:27:28 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-03-24 16:27:28 +0000 |
commit | 0dc0516f0c38ce1eb5e7e2ec2a69b743c33e9ce6 (patch) | |
tree | d38b0682e31545e5875a7cddf4e473fd67dd0ad7 /lib/python/qmk/cli/generate/info_json.py | |
parent | 743d6c430bf09710be9a1055c353fbbceed939ac (diff) | |
parent | 299008be36076343edadb7a36bf2fff820425ad1 (diff) | |
download | qmk_firmware-0dc0516f0c38ce1eb5e7e2ec2a69b743c33e9ce6.tar.gz qmk_firmware-0dc0516f0c38ce1eb5e7e2ec2a69b743c33e9ce6.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli/generate/info_json.py')
-rwxr-xr-x | lib/python/qmk/cli/generate/info_json.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/generate/info_json.py b/lib/python/qmk/cli/generate/info_json.py index f3fc54ddc..6c00ba7d8 100755 --- a/lib/python/qmk/cli/generate/info_json.py +++ b/lib/python/qmk/cli/generate/info_json.py | |||
@@ -8,8 +8,10 @@ from jsonschema import Draft7Validator, validators | |||
8 | from milc import cli | 8 | from milc import cli |
9 | 9 | ||
10 | from qmk.decorators import automagic_keyboard, automagic_keymap | 10 | from qmk.decorators import automagic_keyboard, automagic_keymap |
11 | from qmk.info import info_json, _jsonschema | 11 | from qmk.info import info_json |
12 | from qmk.info_json_encoder import InfoJSONEncoder | 12 | from qmk.info_json_encoder import InfoJSONEncoder |
13 | from qmk.json_schema import load_jsonschema | ||
14 | from qmk.keyboard import keyboard_folder | ||
13 | from qmk.path import is_keyboard | 15 | from qmk.path import is_keyboard |
14 | 16 | ||
15 | 17 | ||
@@ -33,13 +35,13 @@ def strip_info_json(kb_info_json): | |||
33 | """Remove the API-only properties from the info.json. | 35 | """Remove the API-only properties from the info.json. |
34 | """ | 36 | """ |
35 | pruning_draft_7_validator = pruning_validator(Draft7Validator) | 37 | pruning_draft_7_validator = pruning_validator(Draft7Validator) |
36 | schema = _jsonschema('keyboard') | 38 | schema = load_jsonschema('keyboard') |
37 | validator = pruning_draft_7_validator(schema).validate | 39 | validator = pruning_draft_7_validator(schema).validate |
38 | 40 | ||
39 | return validator(kb_info_json) | 41 | return validator(kb_info_json) |
40 | 42 | ||
41 | 43 | ||
42 | @cli.argument('-kb', '--keyboard', help='Keyboard to show info for.') | 44 | @cli.argument('-kb', '--keyboard', type=keyboard_folder, help='Keyboard to show info for.') |
43 | @cli.argument('-km', '--keymap', help='Show the layers for a JSON keymap too.') | 45 | @cli.argument('-km', '--keymap', help='Show the layers for a JSON keymap too.') |
44 | @cli.subcommand('Generate an info.json file for a keyboard.', hidden=False if cli.config.user.developer else True) | 46 | @cli.subcommand('Generate an info.json file for a keyboard.', hidden=False if cli.config.user.developer else True) |
45 | @automagic_keyboard | 47 | @automagic_keyboard |