Skip to content

Commit

Permalink
CI: Unpin Miniconda for CI (pandas-dev#17752)
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAugspurger authored and jreback committed Oct 5, 2017
1 parent 7a57b83 commit 22515f5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/install.ps1
Expand Up @@ -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 + "\"
Expand Down Expand Up @@ -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"
}

Expand Down
6 changes: 2 additions & 4 deletions ci/install_circle.sh
Expand Up @@ -10,17 +10,15 @@ 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"

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
Expand Down
10 changes: 3 additions & 7 deletions ci/install_travis.sh
Expand Up @@ -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

Expand All @@ -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]"
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-2.7.run
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-2.7_LOCALE.run
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/requirements-2.7_WIN.run
Expand Up @@ -8,7 +8,7 @@ matplotlib
openpyxl
xlrd
sqlalchemy
lxml=3.2.1
lxml
scipy
xlsxwriter
s3fs
Expand Down

0 comments on commit 22515f5

Please sign in to comment.