File tree 2 files changed +19
-8
lines changed
2 files changed +19
-8
lines changed Original file line number Diff line number Diff line change @@ -60,11 +60,15 @@ install:
60
60
61
61
# install our build environment
62
62
- 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
66
64
- cmd : conda config --set ssl_verify false
67
65
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
+
68
72
# this is now the downloaded conda...
69
73
- cmd : conda info -a
70
74
Original file line number Diff line number Diff line change @@ -68,19 +68,26 @@ python_major_version="${TRAVIS_PYTHON_VERSION:0:1}"
68
68
[ " $python_major_version " == " 2" ] && python_major_version=" "
69
69
70
70
# install miniconda
71
+ echo " install miniconda"
71
72
if [ " ${TRAVIS_OS_NAME} " == " osx" ]; then
72
73
wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
73
74
else
74
75
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
75
76
fi
76
77
bash miniconda.sh -b -p $HOME /miniconda || exit 1
77
78
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"
83
80
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
84
91
85
92
# Useful for debugging any issues with conda
86
93
conda info -a || exit 1
You can’t perform that action at this time.
0 commit comments