Avoid using subshell for Conda env activation in pip packaging test

apache · Jul 24, 2020 · 71193f1 · 71193f1
1 parent aa54dcf
commit 71193f1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dev/run-pip-tests b/dev/run-pip-tests
@@ -85,7 +85,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
-      source activate "$VIRTUALENV_PATH" || (echo "Falling back to 'conda activate'" && conda activate "$VIRTUALENV_PATH")
+      source activate "$VIRTUALENV_PATH" || conda activate "$VIRTUALENV_PATH"
     else
       mkdir -p "$VIRTUALENV_PATH"
       virtualenv --python=$python "$VIRTUALENV_PATH"
@@ -128,7 +128,7 @@ for python in "${PYTHON_EXECS[@]}"; do
 
     # conda / virtualenv environments need to be deactivated differently
     if [ -n "$USE_CONDA" ]; then
-      source deactivate || (echo "Falling back to 'conda deactivate'" && conda deactivate)
+      source deactivate || conda deactivate
     else
       deactivate
     fi