inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 11:36:44 +00:00
Code

Use python executable we were invoked with (#3303)

Browse Source 
Relying on PATH will disrespect the virtualenv when called from
outside.
This commit is contained in:
Jakob Haufe 2022-07-07 01:02:07 +02:00 committed by GitHub
parent cc8238b790
commit 0d9317addf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasks.py
View File

@ -79,8 +79,9 @@ def manage(c, cmd, pty: bool = False):
cmd: Django command to run. cmd: Django command to run.
pty (bool, optional): Run an interactive session. Defaults to False. pty (bool, optional): Run an interactive session. Defaults to False.
""" """
c.run('cd "{path}" && python3 manage.py {cmd}'.format( c.run('cd "{path}" && {python} manage.py {cmd}'.format(
path=managePyDir(), path=managePyDir(),
python=sys.executable,
cmd=cmd cmd=cmd
), pty=pty) ), pty=pty)
@ -96,7 +97,7 @@ def plugins(c):
print(f"Installing plugin packages from '{plugin_file}'") print(f"Installing plugin packages from '{plugin_file}'")
# Install the plugins # Install the plugins
c.run(f"pip3 install --disable-pip-version-check -U -r '{plugin_file}'") c.run(f"{sys.executable} -m pip install --disable-pip-version-check -U -r '{plugin_file}'")
@task(post=[plugins]) @task(post=[plugins])
@ -105,7 +106,7 @@ def install(c):
print("Installing required python packages from 'requirements.txt'") print("Installing required python packages from 'requirements.txt'")
# Install required Python packages with PIP # Install required Python packages with PIP
c.run('pip3 install --no-cache-dir --disable-pip-version-check -U -r requirements.txt') c.run(f'{sys.executable} -m pip install --no-cache-dir --disable-pip-version-check -U -r requirements.txt')
@task @task
@ -114,7 +115,7 @@ def setup_dev(c):
print("Installing required python packages from 'requirements-dev.txt'") print("Installing required python packages from 'requirements-dev.txt'")
# Install required Python packages with PIP # Install required Python packages with PIP
c.run('pip3 install -U -r requirements-dev.txt') c.run(f'{sys.executable} -m pip install -U -r requirements-dev.txt')
# Install pre-commit hook # Install pre-commit hook
c.run('pre-commit install') c.run('pre-commit install')
@ -171,7 +172,7 @@ def translate_stats(c):
The file generated from this is needed for the UI. The file generated from this is needed for the UI.
""" """
path = os.path.join('InvenTree', 'script', 'translation_stats.py') path = os.path.join('InvenTree', 'script', 'translation_stats.py')
c.run(f'python3 {path}') c.run(f'{sys.executable} {path}')
@task(post=[translate_stats, static]) @task(post=[translate_stats, static])