From 7fb0954c44ccb0ebec90ccc3179f42cc2260a104 Mon Sep 17 00:00:00 2001
From: Jeff Reback <jeff@reback.net>
Date: Tue, 19 Dec 2017 08:26:37 -0500
Subject: [PATCH 1/2] BLD: fix conda install - try again

---
 ci/install_travis.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/install_travis.sh b/ci/install_travis.sh
index e350dd95d9d7e..9944c94f14271 100755
--- a/ci/install_travis.sh
+++ b/ci/install_travis.sh
@@ -48,9 +48,7 @@ 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
@@ -59,6 +57,9 @@ if [ "$CONDA_BUILD_TEST" ]; then
 fi
 
 
+# TODO(jreback) fix cnoda install
+conda install conda=4.3.30
+
 echo
 echo "[add channels]"
 conda config --remove channels defaults || exit 1

From bf18ed51ee4dc33ea2b47728a36c75df0beecdf3 Mon Sep 17 00:00:00 2001
From: Jeff Reback <jeff@reback.net>
Date: Tue, 19 Dec 2017 08:37:09 -0500
Subject: [PATCH 2/2] remove 4.3.31 restrictions & typo

---
 ci/install_travis.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ci/install_travis.sh b/ci/install_travis.sh
index 9944c94f14271..ba1de3dd0397e 100755
--- a/ci/install_travis.sh
+++ b/ci/install_travis.sh
@@ -56,10 +56,6 @@ if [ "$CONDA_BUILD_TEST" ]; then
     conda install conda-build
 fi
 
-
-# TODO(jreback) fix cnoda install
-conda install conda=4.3.30
-
 echo
 echo "[add channels]"
 conda config --remove channels defaults || exit 1
@@ -126,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]"