Don't rely on the subshell

apache · Jul 16, 2020 · 25e87b5 · 25e87b5
1 parent 3dc0c22
commit 25e87b5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/dev/run-pip-tests b/dev/run-pip-tests
@@ -81,8 +81,7 @@ for python in "${PYTHON_EXECS[@]}"; do
         source "$CONDA_PREFIX/etc/profile.d/conda.sh"
       fi
       conda create -y -p "$VIRTUALENV_PATH" python=$python numpy pandas pip setuptools
-      # conda activate "$VIRTUALENV_PATH" || echo "Falling back to 'source activate'
-      source activate "$VIRTUALENV_PATH"
+      conda activate "$VIRTUALENV_PATH" || echo "Falling back to 'source activate'"; source activate "$VIRTUALENV_PATH"
     else
       mkdir -p "$VIRTUALENV_PATH"
       virtualenv --python=$python "$VIRTUALENV_PATH"
@@ -126,7 +125,7 @@ for python in "${PYTHON_EXECS[@]}"; do
 
     # conda / virtualenv environments need to be deactivated differently
     if [ -n "$USE_CONDA" ]; then
-      source deactivate
+      conda deactivate || echo "Falling back to 'source deactivate'"; source deactivate
     else
       deactivate
     fi