summaryrefslogtreecommitdiff
path: root/lib/python/qmk
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-13 17:38:51 +0000
committerQMK Bot <hello@qmk.fm>2021-08-13 17:38:51 +0000
commitcdba934f86717fc7618fd8a5403383d8570f524e (patch)
tree68adf6a238ebede5fb382c99898945a7a48aa8ef /lib/python/qmk
parent4adb7d2176aecdb0e493a5fd40d158722fdb35e7 (diff)
parent4742a3a48f7560ee4dd2b55d4ecad4cdf1d139cd (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk')
-rw-r--r--lib/python/qmk/cli/__init__.py24
1 files changed, 22 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index dea0eaeaf9..b22f1c0d2d 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -69,6 +69,26 @@ subcommands = [
]
+def _install_deps(requirements):
+ """Perform the installation of missing requirements.
+
+ If we detect that we are running in a virtualenv we can't write into we'll use sudo to perform the pip install.
+ """
+ command = [sys.executable, '-m', 'pip', 'install']
+
+ if sys.prefix != sys.base_prefix:
+ # We are in a virtualenv, check to see if we need to use sudo to write to it
+ if not os.access(sys.prefix, os.W_OK):
+ print('Notice: Using sudo to install modules to location owned by root:', sys.prefix)
+ command.insert(0, 'sudo')
+
+ elif not os.access(sys.prefix, os.W_OK):
+ # We can't write to sys.prefix, attempt to install locally
+ command.append('--local')
+
+ return _run_cmd(*command, '-r', requirements)
+
+
def _run_cmd(*command):
"""Run a command in a subshell.
"""
@@ -172,7 +192,7 @@ safe_command = args and args[0] in safe_commands
if not safe_command:
if _broken_module_imports('requirements.txt'):
if yesno('Would you like to install the required Python modules?'):
- _run_cmd(sys.executable, '-m', 'pip', 'install', '-r', 'requirements.txt')
+ _install_deps('requirements.txt')
else:
print()
print(msg_install % (str(Path('requirements.txt').resolve()),))
@@ -181,7 +201,7 @@ if not safe_command:
if cli.config.user.developer and _broken_module_imports('requirements-dev.txt'):
if yesno('Would you like to install the required developer Python modules?'):
- _run_cmd(sys.executable, '-m', 'pip', 'install', '-r', 'requirements-dev.txt')
+ _install_deps('requirements-dev.txt')
elif yesno('Would you like to disable developer mode?'):
_run_cmd(sys.argv[0], 'config', 'user.developer=None')
else: