From 8f87307765d4e527ca79cacee0cbd16166f2088e Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 28 Jun 2019 11:47:10 +0200 Subject: [PATCH] MAINT update travis --- .travis.yml | 9 +++++---- build_tools/travis/install.sh | 7 +------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec39bd97c..04476867b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,14 +33,15 @@ matrix: - env: DISTRIB="ubuntu" # Latest release - env: DISTRIB="conda" PYTHON_VERSION="3.6" - NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.21" + NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.21.2" + OPTIONAL_DEPS="false" - env: DISTRIB="conda" PYTHON_VERSION="3.7" - NUMPY_VERSION="1.14.6" SCIPY_VERSION="1.1.0" SKLEARN_VERSION="0.21" - - env: DISTRIB="conda" PYTHON_VERSION="3.7" - NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="master" + NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.21.2" + OPTIONAL_DEPS="true" allow_failures: - env: DISTRIB="conda" PYTHON_VERSION="3.7" NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="master" + OPTIONAL_DEPS="false" install: source build_tools/travis/install.sh script: bash build_tools/travis/test_script.sh diff --git a/build_tools/travis/install.sh b/build_tools/travis/install.sh index cd31178e2..a6ee7f33d 100755 --- a/build_tools/travis/install.sh +++ b/build_tools/travis/install.sh @@ -10,10 +10,6 @@ set -e -echo 'List files from cached directories' -echo 'pip:' -ls $HOME/.cache/pip - export CC=/usr/lib/ccache/gcc export CXX=/usr/lib/ccache/g++ # Useful for debugging how ccache is used @@ -40,8 +36,7 @@ if [[ "$DISTRIB" == "conda" ]]; then source activate testenv conda install --yes numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION - if [[ $PYTHON_VERSION == "3.6" ]]; then - # Tensorflow is not available in Python 3.7 yet. + if [[ "$OPTIONAL_DEPS" != "true" ]]; then conda install --yes pandas keras tensorflow KERAS_BACKEND=tensorflow python -c "import keras.backend"