BLD: fix conda install - try again (#18841)

pandas-dev · Dec 19, 2017 · 856d9e5 · 856d9e5
1 parent b32dd63
commit 856d9e5
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/ci/install_travis.sh b/ci/install_travis.sh
@@ -48,17 +48,14 @@ echo
 echo "[update conda]"
 conda config --set ssl_verify false || exit 1
 conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
-
-conda install conda=4.3.30
-# conda update -q conda
+conda update -q conda
 
 if [ "$CONDA_BUILD_TEST" ]; then
     echo
     echo "[installing conda-build]"
     conda install conda-build
 fi
 
-
 echo
 echo "[add channels]"
 conda config --remove channels defaults || exit 1
@@ -125,7 +122,7 @@ if [ "$COVERAGE" ]; then
 fi
 
 echo
-if [ -z "$PIP_BUILD_TEST" ] and [ -z "$CONDA_BUILD_TEST" ]; then
+if [ -z "$PIP_BUILD_TEST" ] && [ -z "$CONDA_BUILD_TEST" ]; then
 
     # build but don't install
     echo "[build em]"