zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Call conda more resiliently

Browse Source
This commit is contained in:
yuvipanda
2018-06-26 18:35:58 -07:00
parent 95a2f1987a
commit 303d2d0e88
2 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tljh/conda.py
View File

@@ -4,6 +4,10 @@ Wrap conda commandline program
import os
import subprocess
import json
import sys
# Use sys.executable to call conda to avoid needing to fudge PATH
CONDA_EXECUTABLE = [sys.executable, '-m', 'conda']
def ensure_conda_env(prefix):
@@ -13,7 +17,7 @@ def ensure_conda_env(prefix):
abspath = os.path.abspath(prefix)
try:
output = json.loads(
subprocess.check_output(['conda', 'create', '--json', '--prefix', abspath]).decode()
subprocess.check_output(CONDA_EXECUTABLE + ['create', '--json', '--prefix', abspath]).decode()
)
except subprocess.CalledProcessError as e:
output = json.loads(e.output.decode())
@@ -31,8 +35,8 @@ def ensure_conda_packages(prefix, packages):
abspath = os.path.abspath(prefix)
# Let subprocess errors propagate
# FIXME: raise different exception when using
raw_output = subprocess.check_output([
'conda', 'install',
raw_output = subprocess.check_output(CONDA_EXECUTABLE + [
'install',
'--json',
'--prefix', abspath
] + packages).decode()