aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-06-24 02:30:03 +0000
committerQMK Bot <[email protected]>2024-06-24 02:30:03 +0000
commitc973ee1445c5121fcf2dfdbf7ffcd1a6b7a8ed9c (patch)
tree156168ecd5edacf6233adf85bf306e266d0ca3e8 /lib/python/qmk
parentd4e98e9fda8ed2547f0742a8242ac8724a6dcbee (diff)
parent03e688e91f28d73416ada41c6db209c04d18cba7 (diff)
downloadqmk_firmware-c973ee1445c5121fcf2dfdbf7ffcd1a6b7a8ed9c.tar.gz
qmk_firmware-c973ee1445c5121fcf2dfdbf7ffcd1a6b7a8ed9c.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk')
-rw-r--r--lib/python/qmk/cli/__init__.py1
-rwxr-xr-xlib/python/qmk/cli/userspace/path.py8
-rw-r--r--lib/python/qmk/tests/test_cli_commands.py2
3 files changed, 10 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index b656909f85..a64f90c29b 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -87,6 +87,7 @@ subcommands = [
'qmk.cli.userspace.compile',
'qmk.cli.userspace.doctor',
'qmk.cli.userspace.list',
+ 'qmk.cli.userspace.path',
'qmk.cli.userspace.remove',
'qmk.cli.via2json',
]
diff --git a/lib/python/qmk/cli/userspace/path.py b/lib/python/qmk/cli/userspace/path.py
new file mode 100755
index 0000000000..df4648e8c7
--- /dev/null
+++ b/lib/python/qmk/cli/userspace/path.py
@@ -0,0 +1,8 @@
+from milc import cli
+from qmk.constants import QMK_USERSPACE
+
+
[email protected]('Detected path to QMK Userspace.', hidden=True)
+def userspace_path(cli):
+ print(QMK_USERSPACE)
+ return
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 1725e3ea79..8b50d1c340 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -249,7 +249,7 @@ def test_c2json_nocpp_stdin():
def test_clean():
result = check_subcommand('clean', '-a')
check_returncode(result)
- assert result.stdout.count('done') == 2
+ assert (result.stdout.count('done') == 2 and 'userspace' not in result.stdout) or (result.stdout.count('done') == 3 and 'userspace' in result.stdout)
def test_generate_api():