diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-25 11:38:44 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-25 11:38:44 +0000 |
| commit | a747ef966ba6dc5f52d8e6aa60d7d3e9bcf67758 (patch) | |
| tree | d1fef064be28adc655a76afff61bc96578ee6239 /lib/python/qmk/cli/generate | |
| parent | 87f6df0655486bc372b0205f1261ac28026abaac (diff) | |
| parent | 3e60997edba46544557b3a775bdb1538e07c3edf (diff) | |
| download | qmk_firmware-a747ef966ba6dc5f52d8e6aa60d7d3e9bcf67758.tar.gz qmk_firmware-a747ef966ba6dc5f52d8e6aa60d7d3e9bcf67758.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli/generate')
| -rwxr-xr-x | lib/python/qmk/cli/generate/api.py | 2 | ||||
| -rwxr-xr-x | lib/python/qmk/cli/generate/info_json.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py index 290590834..70019428f 100755 --- a/lib/python/qmk/cli/generate/api.py +++ b/lib/python/qmk/cli/generate/api.py | |||
| @@ -8,7 +8,7 @@ from milc import cli | |||
| 8 | 8 | ||
| 9 | from qmk.datetime import current_datetime | 9 | from qmk.datetime import current_datetime |
| 10 | from qmk.info import info_json | 10 | from qmk.info import info_json |
| 11 | from qmk.info_json_encoder import InfoJSONEncoder | 11 | from qmk.json_encoders import InfoJSONEncoder |
| 12 | from qmk.json_schema import json_load | 12 | from qmk.json_schema import json_load |
| 13 | from qmk.keyboard import list_keyboards | 13 | from qmk.keyboard import list_keyboards |
| 14 | 14 | ||
diff --git a/lib/python/qmk/cli/generate/info_json.py b/lib/python/qmk/cli/generate/info_json.py index 6c00ba7d8..1af7f0439 100755 --- a/lib/python/qmk/cli/generate/info_json.py +++ b/lib/python/qmk/cli/generate/info_json.py | |||
| @@ -9,7 +9,7 @@ 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 | 11 | from qmk.info import info_json |
| 12 | from qmk.info_json_encoder import InfoJSONEncoder | 12 | from qmk.json_encoders import InfoJSONEncoder |
| 13 | from qmk.json_schema import load_jsonschema | 13 | from qmk.json_schema import load_jsonschema |
| 14 | from qmk.keyboard import keyboard_folder | 14 | from qmk.keyboard import keyboard_folder |
| 15 | from qmk.path import is_keyboard | 15 | from qmk.path import is_keyboard |