summaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/qmk/cli')
-rwxr-xr-xlib/python/qmk/cli/doctor.py30
-rw-r--r--lib/python/qmk/cli/nose2.py18
2 files changed, 40 insertions, 8 deletions
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py
index 9ce765a4b5..c5a144363c 100755
--- a/lib/python/qmk/cli/doctor.py
+++ b/lib/python/qmk/cli/doctor.py
@@ -2,9 +2,11 @@
Check up for QMK environment.
"""
-import shutil
-import platform
import os
+import platform
+import shutil
+import subprocess
+from glob import glob
from milc import cli
@@ -16,32 +18,44 @@ def main(cli):
This is currently very simple, it just checks that all the expected binaries are on your system.
TODO(unclaimed):
- * [ ] Run the binaries to make sure they work
* [ ] Compile a trivial program with each compiler
* [ ] Check for udev entries on linux
"""
binaries = ['dfu-programmer', 'avrdude', 'dfu-util', 'avr-gcc', 'arm-none-eabi-gcc']
+ binaries += glob('bin/qmk-*')
- cli.log.info('QMK Doctor is Checking your environment')
+ cli.log.info('QMK Doctor is checking your environment')
ok = True
for binary in binaries:
res = shutil.which(binary)
if res is None:
- cli.log.error('{fg_red}QMK can\'t find ' + binary + ' in your path')
+ cli.log.error("{fg_red}QMK can't find %s in your path", binary)
ok = False
+ else:
+ try:
+ subprocess.run([binary, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=5, check=True)
+ except subprocess.CalledProcessError:
+ cli.log.error("{fg_red}Can't run `%s --version`", binary)
+ ok = False
OS = platform.system()
if OS == "Darwin":
cli.log.info("Detected {fg_cyan}macOS")
elif OS == "Linux":
cli.log.info("Detected {fg_cyan}linux")
- test = 'systemctl list-unit-files | grep enabled | grep -i ModemManager'
- if os.system(test) == 0:
- cli.log.warn("{bg_yellow}Detected modem manager. Please disable it if you are using Pro Micros")
+ if shutil.which('systemctl'):
+ test = 'systemctl list-unit-files | grep enabled | grep -i ModemManager'
+ if os.system(test) == 0:
+ cli.log.warn("{bg_yellow}Detected modem manager. Please disable it if you are using Pro Micros")
+ else:
+ cli.log.warn("Can't find systemctl to check for ModemManager.")
else:
cli.log.info("Assuming {fg_cyan}Windows")
if ok:
cli.log.info('{fg_green}QMK is ready to go')
+ else:
+ cli.log.info('{fg_yellow}Problems detected, please fix these problems before proceeding.')
+ # FIXME(skullydazed): Link to a document about troubleshooting, or discord or something
diff --git a/lib/python/qmk/cli/nose2.py b/lib/python/qmk/cli/nose2.py
new file mode 100644
index 0000000000..c6c9c67b30
--- /dev/null
+++ b/lib/python/qmk/cli/nose2.py
@@ -0,0 +1,18 @@
+"""QMK Python Unit Tests
+
+QMK script to run unit and integration tests against our python code.
+"""
+from milc import cli
+
+
+@cli.entrypoint('QMK Python Unit Tests')
+def main(cli):
+ """Use nose2 to run unittests
+ """
+ try:
+ import nose2
+ except ImportError:
+ cli.log.error('Could not import nose2! Please install it with {fg_cyan}pip3 install nose2')
+ return False
+
+ nose2.discover()