Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitlab.com:slumber/multi-user into develop

Browse Source
This commit is contained in:
Swann
2020-09-02 16:45:08 +02:00
parent 605bcc7581 e31d76a641
commit f2da4cb8e9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
multi_user/environment.py
View File

@ -52,7 +52,15 @@ def install_pip():
def install_package(name, version): def install_package(name, version):
logging.info(f"installing {name} version...") logging.info(f"installing {name} version...")
subprocess.run([str(PYTHON_PATH), "-m", "pip", "install", f"{name}=={version}"]) env = os.environ
if "PIP_REQUIRE_VIRTUALENV" in env:
# PIP_REQUIRE_VIRTUALENV is an env var to ensure pip cannot install packages outside a virtual env
# https://docs.python-guide.org/dev/pip-virtualenv/
# But since Blender's pip is outside of a virtual env, it can block our packages installation, so we unset the
# env var for the subprocess.
env = os.environ.copy()
del env["PIP_REQUIRE_VIRTUALENV"]
subprocess.run([str(PYTHON_PATH), "-m", "pip", "install", f"{name}=={version}"], env=env)
def check_package_version(name, required_version): def check_package_version(name, required_version):
logging.info(f"Checking {name} version...") logging.info(f"Checking {name} version...")