Skip to content

Commit b06bc7a

Browse files
committed
BLD: revert to using an always current conda
closes #13444 BLD: have a correct channel priorty
1 parent 6d8c04c commit b06bc7a

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

appveyor.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,15 @@ install:
6060

6161
# install our build environment
6262
- cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
63-
#- cmd: conda update -q conda
64-
- cmd: conda install conda==4.0.8
65-
- cmd: conda config --add channels http://conda.anaconda.org/pandas
63+
- cmd: conda update -q conda
6664
- cmd: conda config --set ssl_verify false
6765

66+
# add the pandas channel *before* defaults to have defaults take priority
67+
- cmd: conda config --add channels pandas
68+
- cmd: conda config --remove channels defaults
69+
- cmd: conda config --add channels defaults
70+
- cmd: conda install anaconda-client
71+
6872
# this is now the downloaded conda...
6973
- cmd: conda info -a
7074

ci/install_travis.sh

+12-5
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,26 @@ python_major_version="${TRAVIS_PYTHON_VERSION:0:1}"
6868
[ "$python_major_version" == "2" ] && python_major_version=""
6969

7070
# install miniconda
71+
echo "install miniconda"
7172
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
7273
wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
7374
else
7475
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
7576
fi
7677
bash miniconda.sh -b -p $HOME/miniconda || exit 1
7778

78-
conda config --set always_yes yes --set changeps1 no || exit 1
79-
80-
# fix the conda version
81-
conda install conda==4.0.8
82-
conda config --add channels http://conda.anaconda.org/pandas || exit 1
79+
echo "update conda"
8380
conda config --set ssl_verify false || exit 1
81+
conda config --set always_yes true --set changeps1 false || exit 1
82+
conda update -q conda
83+
84+
# add the pandas channel *before* defaults to have defaults take priority
85+
echo "add channels"
86+
conda config --add channels pandas || exit 1
87+
conda config --remove channels defaults || exit 1
88+
conda config --add channels defaults || exit 1
89+
90+
conda install anaconda-client
8491

8592
# Useful for debugging any issues with conda
8693
conda info -a || exit 1

0 commit comments

Comments
 (0)