Skip to content

Commit 8658da9

Browse files
committed
Merge pull request #11397 from jreback/conda-revert
Revert "BLD: conda"
2 parents 0c8a8e1 + c2b8650 commit 8658da9

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

ci/install_conda.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O mini
7171
bash miniconda.sh -b -p $HOME/miniconda || exit 1
7272

7373
conda config --set always_yes yes --set changeps1 no || exit 1
74-
#conda update -q conda || exit 1
74+
conda update -q conda || exit 1
7575
conda config --add channels conda-forge || exit 1
7676
conda config --add channels http://conda.binstar.org/pandas || exit 1
7777
conda config --set ssl_verify false || exit 1
@@ -84,9 +84,7 @@ REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.build"
8484
time conda create -n pandas python=$TRAVIS_PYTHON_VERSION nose || exit 1
8585
time conda install -n pandas --file=${REQ} || exit 1
8686

87-
echo "activating pandas env: start"
8887
source activate pandas
89-
echo "activating pandas env: done"
9088

9189
# set the compiler cache to work
9290
if [ "$IRON_TOKEN" ]; then
@@ -108,7 +106,6 @@ if [ "$BUILD_TEST" ]; then
108106
else
109107

110108
# build but don't install
111-
echo "starting build"
112109
time python setup.py build_ext --inplace || exit 1
113110

114111
# we may have run installations

0 commit comments

Comments
 (0)