File tree Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -33,14 +33,18 @@ matrix:
3333 - env : DISTRIB="ubuntu"
3434 # Latest release
3535 - env : DISTRIB="conda" PYTHON_VERSION="3.6"
36- NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.21"
36+ NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.21.2"
37+ OPTIONAL_DEPS="true"
3738 - env : DISTRIB="conda" PYTHON_VERSION="3.7"
38- NUMPY_VERSION="1.14.6" SCIPY_VERSION="1.1.0" SKLEARN_VERSION="0.21"
39+ NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.21.2"
40+ OPTIONAL_DEPS="false"
3941 - env : DISTRIB="conda" PYTHON_VERSION="3.7"
4042 NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="master"
43+ OPTIONAL_DEPS="false"
4144 allow_failures :
4245 - env : DISTRIB="conda" PYTHON_VERSION="3.7"
4346 NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="master"
47+ OPTIONAL_DEPS="false"
4448
4549install : source build_tools/travis/install.sh
4650script : bash build_tools/travis/test_script.sh
Original file line number Diff line number Diff line change 1010
1111set -e
1212
13- echo ' List files from cached directories'
14- echo ' pip:'
15- ls $HOME /.cache/pip
16-
1713export CC=/usr/lib/ccache/gcc
1814export CXX=/usr/lib/ccache/g++
1915# Useful for debugging how ccache is used
@@ -32,16 +28,15 @@ if [[ "$DISTRIB" == "conda" ]]; then
3228 MINICONDA_PATH=/home/travis/miniconda
3329 chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
3430 export PATH=$MINICONDA_PATH /bin:$PATH
35- conda update --yes conda
31+ conda install --yes conda=4.6
3632
3733 # Configure the conda environment and put it in the path using the
3834 # provided versions
3935 conda create -n testenv --yes python=$PYTHON_VERSION pip
4036 source activate testenv
4137 conda install --yes numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION
4238
43- if [[ $PYTHON_VERSION == " 3.6" ]]; then
44- # Tensorflow is not available in Python 3.7 yet.
39+ if [[ " $OPTIONAL_DEPS " == " true" ]]; then
4540 conda install --yes pandas keras tensorflow
4641 KERAS_BACKEND=tensorflow
4742 python -c " import keras.backend"
You can’t perform that action at this time.
0 commit comments