Skip to content

Commit eae6c6b

Browse files
committed
MAINT update travis
1 parent 86f552d commit eae6c6b

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Diff for: .travis.yml

+6-2
Original file line numberDiff line numberDiff 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="false"
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

4549
install: source build_tools/travis/install.sh
4650
script: bash build_tools/travis/test_script.sh

Diff for: build_tools/travis/install.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
set -e
1212

13-
echo 'List files from cached directories'
14-
echo 'pip:'
15-
ls $HOME/.cache/pip
16-
1713
export CC=/usr/lib/ccache/gcc
1814
export CXX=/usr/lib/ccache/g++
1915
# Useful for debugging how ccache is used
@@ -40,8 +36,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
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"

0 commit comments

Comments
 (0)