diff options
author | Ryan <fauxpark@gmail.com> | 2021-07-30 15:37:18 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 22:37:18 -0700 |
commit | 25f43837d2d603505a498662993bdeaecb7bc43d (patch) | |
tree | 476cda71954995b842c9737d11577ca96811bc63 /lib/python | |
parent | 441914e0ad6163a83cd19953821e191033a45fe2 (diff) | |
download | qmk_firmware-25f43837d2d603505a498662993bdeaecb7bc43d.tar.gz qmk_firmware-25f43837d2d603505a498662993bdeaecb7bc43d.zip |
Remove references to info.json `width` and `height` in CLI (#13728)
Diffstat (limited to 'lib/python')
-rwxr-xr-x | lib/python/qmk/cli/info.py | 2 | ||||
-rwxr-xr-x | lib/python/qmk/cli/kle2json.py | 2 | ||||
-rwxr-xr-x | lib/python/qmk/json_encoders.py | 3 | ||||
-rw-r--r-- | lib/python/qmk/tests/minimal_info.json | 2 | ||||
-rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 4 |
5 files changed, 2 insertions, 11 deletions
diff --git a/lib/python/qmk/cli/info.py b/lib/python/qmk/cli/info.py index 0d08d242c..337b494a9 100755 --- a/lib/python/qmk/cli/info.py +++ b/lib/python/qmk/cli/info.py | |||
@@ -87,8 +87,6 @@ def print_friendly_output(kb_info_json): | |||
87 | cli.echo('{fg_blue}Maintainer{fg_reset}: %s', kb_info_json['maintainer']) | 87 | cli.echo('{fg_blue}Maintainer{fg_reset}: %s', kb_info_json['maintainer']) |
88 | cli.echo('{fg_blue}Keyboard Folder{fg_reset}: %s', kb_info_json.get('keyboard_folder', 'Unknown')) | 88 | cli.echo('{fg_blue}Keyboard Folder{fg_reset}: %s', kb_info_json.get('keyboard_folder', 'Unknown')) |
89 | cli.echo('{fg_blue}Layouts{fg_reset}: %s', ', '.join(sorted(kb_info_json['layouts'].keys()))) | 89 | cli.echo('{fg_blue}Layouts{fg_reset}: %s', ', '.join(sorted(kb_info_json['layouts'].keys()))) |
90 | if 'width' in kb_info_json and 'height' in kb_info_json: | ||
91 | cli.echo('{fg_blue}Size{fg_reset}: %s x %s' % (kb_info_json['width'], kb_info_json['height'])) | ||
92 | cli.echo('{fg_blue}Processor{fg_reset}: %s', kb_info_json.get('processor', 'Unknown')) | 90 | cli.echo('{fg_blue}Processor{fg_reset}: %s', kb_info_json.get('processor', 'Unknown')) |
93 | cli.echo('{fg_blue}Bootloader{fg_reset}: %s', kb_info_json.get('bootloader', 'Unknown')) | 91 | cli.echo('{fg_blue}Bootloader{fg_reset}: %s', kb_info_json.get('bootloader', 'Unknown')) |
94 | if 'layout_aliases' in kb_info_json: | 92 | if 'layout_aliases' in kb_info_json: |
diff --git a/lib/python/qmk/cli/kle2json.py b/lib/python/qmk/cli/kle2json.py index acb75ef4f..bbfddf426 100755 --- a/lib/python/qmk/cli/kle2json.py +++ b/lib/python/qmk/cli/kle2json.py | |||
@@ -44,8 +44,6 @@ def kle2json(cli): | |||
44 | 'keyboard_name': kle.name, | 44 | 'keyboard_name': kle.name, |
45 | 'url': '', | 45 | 'url': '', |
46 | 'maintainer': 'qmk', | 46 | 'maintainer': 'qmk', |
47 | 'width': kle.columns, | ||
48 | 'height': kle.rows, | ||
49 | 'layouts': { | 47 | 'layouts': { |
50 | 'LAYOUT': { | 48 | 'LAYOUT': { |
51 | 'layout': kle2qmk(kle) | 49 | 'layout': kle2qmk(kle) |
diff --git a/lib/python/qmk/json_encoders.py b/lib/python/qmk/json_encoders.py index 9f3da022b..72e91973a 100755 --- a/lib/python/qmk/json_encoders.py +++ b/lib/python/qmk/json_encoders.py | |||
@@ -102,9 +102,6 @@ class InfoJSONEncoder(QMKJSONEncoder): | |||
102 | elif key == 'maintainer': | 102 | elif key == 'maintainer': |
103 | return '12maintainer' | 103 | return '12maintainer' |
104 | 104 | ||
105 | elif key in ('height', 'width'): | ||
106 | return '40' + str(key) | ||
107 | |||
108 | elif key == 'community_layouts': | 105 | elif key == 'community_layouts': |
109 | return '97community_layouts' | 106 | return '97community_layouts' |
110 | 107 | ||
diff --git a/lib/python/qmk/tests/minimal_info.json b/lib/python/qmk/tests/minimal_info.json index b91c23bd3..11ef12fef 100644 --- a/lib/python/qmk/tests/minimal_info.json +++ b/lib/python/qmk/tests/minimal_info.json | |||
@@ -1,8 +1,6 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "tester", | 2 | "keyboard_name": "tester", |
3 | "maintainer": "qmk", | 3 | "maintainer": "qmk", |
4 | "height": 5, | ||
5 | "width": 15, | ||
6 | "layouts": { | 4 | "layouts": { |
7 | "LAYOUT": { | 5 | "LAYOUT": { |
8 | "layout": [ | 6 | "layout": [ |
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index 022b24203..b39fe5e46 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py | |||
@@ -273,7 +273,7 @@ def test_generate_layouts(): | |||
273 | def test_format_json_keyboard(): | 273 | def test_format_json_keyboard(): |
274 | result = check_subcommand('format-json', '--format', 'keyboard', 'lib/python/qmk/tests/minimal_info.json') | 274 | result = check_subcommand('format-json', '--format', 'keyboard', 'lib/python/qmk/tests/minimal_info.json') |
275 | check_returncode(result) | 275 | check_returncode(result) |
276 | assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "height": 5,\n "width": 15,\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n' | 276 | assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n' |
277 | 277 | ||
278 | 278 | ||
279 | def test_format_json_keymap(): | 279 | def test_format_json_keymap(): |
@@ -285,7 +285,7 @@ def test_format_json_keymap(): | |||
285 | def test_format_json_keyboard_auto(): | 285 | def test_format_json_keyboard_auto(): |
286 | result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_info.json') | 286 | result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_info.json') |
287 | check_returncode(result) | 287 | check_returncode(result) |
288 | assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "height": 5,\n "width": 15,\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n' | 288 | assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n' |
289 | 289 | ||
290 | 290 | ||
291 | def test_format_json_keymap_auto(): | 291 | def test_format_json_keymap_auto(): |