summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2024-12-15 04:00:18 +0000
committerGitHub <noreply@github.com>2024-12-15 15:00:18 +1100
commit767dfbbd3f94dcddb2061cd8338dd166d985df9d (patch)
tree72c76a333f6fc92bf2adf322c6daf58e2b709053
parent296e4539f5bfa8a23af6c48526a42dbc827a82eb (diff)
Resolve `cli.log.warn` warnings (#24551)
-rwxr-xr-xlib/python/qmk/cli/doctor/main.py6
-rw-r--r--lib/python/qmk/cli/import/kbfirmware.py2
-rw-r--r--lib/python/qmk/cli/userspace/list.py2
-rw-r--r--lib/python/qmk/git.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/qmk/cli/doctor/main.py b/lib/python/qmk/cli/doctor/main.py
index 5215d3a7ee..391353ebbf 100755
--- a/lib/python/qmk/cli/doctor/main.py
+++ b/lib/python/qmk/cli/doctor/main.py
@@ -102,10 +102,10 @@ def userspace_tests(qmk_firmware):
102 qmk_userspace_validate(path) 102 qmk_userspace_validate(path)
103 cli.log.info(f'Testing userspace candidate: {{fg_cyan}}{path}{{fg_reset}} -- {{fg_green}}Valid `qmk.json`') 103 cli.log.info(f'Testing userspace candidate: {{fg_cyan}}{path}{{fg_reset}} -- {{fg_green}}Valid `qmk.json`')
104 except FileNotFoundError: 104 except FileNotFoundError:
105 cli.log.warn(f'Testing userspace candidate: {{fg_cyan}}{path}{{fg_reset}} -- {{fg_red}}Missing `qmk.json`') 105 cli.log.warning(f'Testing userspace candidate: {{fg_cyan}}{path}{{fg_reset}} -- {{fg_red}}Missing `qmk.json`')
106 except UserspaceValidationError as err: 106 except UserspaceValidationError as err:
107 cli.log.warn(f'Testing userspace candidate: {{fg_cyan}}{path}{{fg_reset}} -- {{fg_red}}Invalid `qmk.json`') 107 cli.log.warning(f'Testing userspace candidate: {{fg_cyan}}{path}{{fg_reset}} -- {{fg_red}}Invalid `qmk.json`')
108 cli.log.warn(f' -- {{fg_cyan}}{path}/qmk.json{{fg_reset}} validation error: {err}') 108 cli.log.warning(f' -- {{fg_cyan}}{path}/qmk.json{{fg_reset}} validation error: {err}')
109 109
110 if QMK_USERSPACE is not None: 110 if QMK_USERSPACE is not None:
111 cli.log.info(f'QMK userspace: {{fg_cyan}}{QMK_USERSPACE}') 111 cli.log.info(f'QMK userspace: {{fg_cyan}}{QMK_USERSPACE}')
diff --git a/lib/python/qmk/cli/import/kbfirmware.py b/lib/python/qmk/cli/import/kbfirmware.py
index 9c03737378..feccb3cfcc 100644
--- a/lib/python/qmk/cli/import/kbfirmware.py
+++ b/lib/python/qmk/cli/import/kbfirmware.py
@@ -15,7 +15,7 @@ def import_kbfirmware(cli):
15 cli.log.info(f'{{style_bright}}Importing {filename.name}.{{style_normal}}') 15 cli.log.info(f'{{style_bright}}Importing {filename.name}.{{style_normal}}')
16 cli.echo('') 16 cli.echo('')
17 17
18 cli.log.warn("Support here is basic - Consider using 'qmk new-keyboard' instead") 18 cli.log.warning("Support here is basic - Consider using 'qmk new-keyboard' instead")
19 19
20 kb_name = _import_kbfirmware(data) 20 kb_name = _import_kbfirmware(data)
21 21
diff --git a/lib/python/qmk/cli/userspace/list.py b/lib/python/qmk/cli/userspace/list.py
index 9f83a14a2a..e902483b6b 100644
--- a/lib/python/qmk/cli/userspace/list.py
+++ b/lib/python/qmk/cli/userspace/list.py
@@ -66,4 +66,4 @@ def userspace_list(cli):
66 if is_all_keyboards(keyboard) or is_keymap_target(keyboard_folder(keyboard), keymap): 66 if is_all_keyboards(keyboard) or is_keymap_target(keyboard_folder(keyboard), keymap):
67 cli.log.info(f'Keyboard: {{fg_cyan}}{keyboard}{{fg_reset}}, keymap: {{fg_cyan}}{keymap}{{fg_reset}}{extra_args_str}') 67 cli.log.info(f'Keyboard: {{fg_cyan}}{keyboard}{{fg_reset}}, keymap: {{fg_cyan}}{keymap}{{fg_reset}}{extra_args_str}')
68 else: 68 else:
69 cli.log.warn(f'Keyboard: {{fg_cyan}}{keyboard}{{fg_reset}}, keymap: {{fg_cyan}}{keymap}{{fg_reset}}{extra_args_str} -- not found!') 69 cli.log.warning(f'Keyboard: {{fg_cyan}}{keyboard}{{fg_reset}}, keymap: {{fg_cyan}}{keymap}{{fg_reset}}{extra_args_str} -- not found!')
diff --git a/lib/python/qmk/git.py b/lib/python/qmk/git.py
index b6c11edbfe..9d567475d8 100644
--- a/lib/python/qmk/git.py
+++ b/lib/python/qmk/git.py
@@ -26,7 +26,7 @@ def git_get_version(repo_dir='.', check_dir='.'):
26 return git_describe.stdout.strip() 26 return git_describe.stdout.strip()
27 27
28 else: 28 else:
29 cli.log.warn(f'"{" ".join(git_describe_cmd)}" returned error code {git_describe.returncode}') 29 cli.log.warning(f'"{" ".join(git_describe_cmd)}" returned error code {git_describe.returncode}')
30 print(git_describe.stderr) 30 print(git_describe.stderr)
31 return None 31 return None
32 32