@@ -17,57 +17,43 @@ export CXX=/usr/lib/ccache/g++
1717# ~60M is used by .ccache when compiling from scratch at the time of writing
1818ccache --max-size 100M --show-stats
1919
20- if [[ " $DISTRIB " == " conda" ]]; then
21- # Deactivate the travis-provided virtual environment and setup a
22- # conda-based environment instead
23- deactivate
20+ # Deactivate the travis-provided virtual environment and setup a
21+ # conda-based environment instead
22+ deactivate
2423
25- # Install miniconda
26- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
27- -O miniconda.sh
28- MINICONDA_PATH=/home/travis/miniconda
29- chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
30- export PATH=$MINICONDA_PATH /bin:$PATH
24+ # Install miniconda
25+ wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
26+ -O miniconda.sh
27+ MINICONDA_PATH=/home/travis/miniconda
28+ chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
29+ export PATH=$MINICONDA_PATH /bin:$PATH
3130
32- # Configure the conda environment and put it in the path using the
33- # provided versions
34- conda create -n testenv --yes python=$PYTHON_VERSION pip
35- source activate testenv
36- conda install --yes numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION
31+ # Configure the conda environment and put it in the path using the
32+ # provided versions
33+ conda create -n testenv --yes python=$PYTHON_VERSION pip
34+ source activate testenv
3735
38- if [[ " $OPTIONAL_DEPS " == " keras" ]]; then
39- conda install --yes pandas keras tensorflow=1
40- KERAS_BACKEND=tensorflow
41- python -c " import keras.backend"
42- sed -i -e ' s/"backend":[[:space:]]*"[^"]*/"backend":\ "' $KERAS_BACKEND ' /g' ~ /.keras/keras.json;
43- elif [[ " $OPTIONAL_DEPS " == " tensorflow" ]]; then
44- conda install --yes pandas tensorflow
45- fi
36+ pip install --upgrade pip setuptools
37+ echo " Installing numpy and scipy master wheels"
38+ dev_url=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com
39+ pip install --pre --upgrade --timeout=60 -f $dev_url numpy scipy pandas cython
40+ echo " Installing joblib master"
41+ pip install https://github.com/joblib/joblib/archive/master.zip
4642
47- if [[ " $SKLEARN_VERSION " == " master" ]]; then
48- pip install --pre -f https://sklearn-nightly.scdn8.secure.raxcdn.com scikit-learn
49- else
50- conda install --yes scikit-learn=$SKLEARN_VERSION
51- fi
52-
53- conda install --yes pytest pytest-cov
54- pip install codecov
55- pip install -U git+https://github.com/numpy/numpydoc.git
56-
57- elif [[ " $DISTRIB " == " ubuntu" ]]; then
58- # At the time of writing numpy 1.9.1 is included in the travis
59- # virtualenv but we want to use the numpy installed through apt-get
60- # install.
61- deactivate
62- # Create a new virtualenv using system site packages for python, numpy
63- virtualenv --system-site-packages --python=python3 testvenv
64- source testvenv/bin/activate
43+ if [[ " $OPTIONAL_DEPS " == " keras" ]]; then
44+ conda install --yes keras tensorflow=1
45+ KERAS_BACKEND=tensorflow
46+ python -c " import keras.backend"
47+ sed -i -e ' s/"backend":[[:space:]]*"[^"]*/"backend":\ "' $KERAS_BACKEND ' /g' ~ /.keras/keras.json;
48+ elif [[ " $OPTIONAL_DEPS " == " tensorflow" ]]; then
49+ conda install --yes tensorflow
50+ fi
6551
66- pip install --pre -f https://sklearn-nightly.scdn8.secure.raxcdn.com scikit-learn
67- pip3 install pandas
68- pip3 install pytest pytest-cov codecov sphinx numpydoc
52+ pip install --pre --extra-index https://pypi.anaconda.org/scipy-wheels-nightly/simple scikit-learn
6953
70- fi
54+ conda install --yes pytest pytest-cov
55+ pip install codecov
56+ pip install -U git+https://github.com/numpy/numpydoc.git
7157
7258python --version
7359python -c " import numpy; print('numpy %s' % numpy.__version__)"
0 commit comments