From 22515f58c178cdb5cd38c4e56f26dc91c7053550 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <TomAugspurger@users.noreply.github.com>
Date: Thu, 5 Oct 2017 13:37:16 -0500
Subject: [PATCH] CI: Unpin Miniconda for CI (#17752)

---
 appveyor.yml                   |  2 +-
 ci/install.ps1                 |  4 ++--
 ci/install_circle.sh           |  6 ++----
 ci/install_travis.sh           | 10 +++-------
 ci/requirements-2.7.run        |  2 +-
 ci/requirements-2.7_LOCALE.run |  2 +-
 ci/requirements-2.7_WIN.run    |  2 +-
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f1259f271ee39..a1f8886f6d068 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -59,7 +59,7 @@ install:
 
   # install our build environment
   - cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
-  # - cmd: conda update -q conda
+  - cmd: conda update -q conda
   - cmd: conda config --set ssl_verify false
 
   # add the pandas channel *before* defaults to have defaults take priority
diff --git a/ci/install.ps1 b/ci/install.ps1
index b784b4ebf5e6a..64ec7f81884cd 100644
--- a/ci/install.ps1
+++ b/ci/install.ps1
@@ -7,7 +7,7 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/"
 
 function DownloadMiniconda ($python_version, $platform_suffix) {
     $webclient = New-Object System.Net.WebClient
-    $filename = "Miniconda3-4.3.21-Windows-" + $platform_suffix + ".exe"
+    $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
     $url = $MINICONDA_URL + $filename
 
     $basedir = $pwd.Path + "\"
@@ -85,7 +85,7 @@ function UpdateConda ($python_home) {
 
 function main () {
     InstallMiniconda "3.5" $env:PYTHON_ARCH $env:CONDA_ROOT
-    # UpdateConda $env:CONDA_ROOT
+    UpdateConda $env:CONDA_ROOT
     InstallCondaPackages $env:CONDA_ROOT "conda-build jinja2 anaconda-client"
 }
 
diff --git a/ci/install_circle.sh b/ci/install_circle.sh
index eba98be561397..fd79f907625e9 100755
--- a/ci/install_circle.sh
+++ b/ci/install_circle.sh
@@ -10,9 +10,7 @@ echo "[Using clean Miniconda install]"
 rm -rf "$MINICONDA_DIR"
 
 # install miniconda
-# wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1
-# Pin miniconda
-wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-Linux-x86_64.sh -q -O miniconda.sh || exit 1
+wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1
 bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
 
 export PATH="$MINICONDA_DIR/bin:$PATH"
@@ -20,7 +18,7 @@ export PATH="$MINICONDA_DIR/bin:$PATH"
 echo "[update conda]"
 conda config --set ssl_verify false || exit 1
 conda config --set always_yes true --set changeps1 false || exit 1
-# conda update -q conda
+conda update -q conda
 
 # add the pandas channel to take priority
 # to add extra packages
diff --git a/ci/install_travis.sh b/ci/install_travis.sh
index faf404ddcd293..b85263daa1eac 100755
--- a/ci/install_travis.sh
+++ b/ci/install_travis.sh
@@ -34,13 +34,9 @@ fi
 
 # install miniconda
 if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
-    # temporarily pin miniconda
-    # time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
-    time wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-MacOSX-x86_64.sh -O miniconda.sh || exit 1
+    time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
 else
-    # temporarily pin miniconda
-    # time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
-    time wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-Linux-x86_64.sh -O miniconda.sh || exit 1
+    time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
 fi
 time bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
 
@@ -52,7 +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 update -q conda
+conda update -q conda
 
 echo
 echo "[add channels]"
diff --git a/ci/requirements-2.7.run b/ci/requirements-2.7.run
index 7152cb2c8b605..a68e1d256058d 100644
--- a/ci/requirements-2.7.run
+++ b/ci/requirements-2.7.run
@@ -8,7 +8,7 @@ matplotlib
 openpyxl=1.6.2
 xlrd=0.9.2
 sqlalchemy=0.9.6
-lxml=3.2.1
+lxml
 scipy
 xlsxwriter=0.5.2
 s3fs
diff --git a/ci/requirements-2.7_LOCALE.run b/ci/requirements-2.7_LOCALE.run
index 00006106f7009..978bbf6a051c5 100644
--- a/ci/requirements-2.7_LOCALE.run
+++ b/ci/requirements-2.7_LOCALE.run
@@ -8,5 +8,5 @@ xlrd=0.9.2
 bottleneck=1.0.0
 matplotlib=1.4.3
 sqlalchemy=0.8.1
-lxml=3.2.1
+lxml
 scipy
diff --git a/ci/requirements-2.7_WIN.run b/ci/requirements-2.7_WIN.run
index a81542ee5006c..c4ca7fc736bb1 100644
--- a/ci/requirements-2.7_WIN.run
+++ b/ci/requirements-2.7_WIN.run
@@ -8,7 +8,7 @@ matplotlib
 openpyxl
 xlrd
 sqlalchemy
-lxml=3.2.1
+lxml
 scipy
 xlsxwriter
 s3fs