File tree Expand file tree Collapse file tree 2 files changed +6
-15
lines changed Expand file tree Collapse file tree 2 files changed +6
-15
lines changed Original file line number Diff line number Diff line change @@ -33,11 +33,9 @@ 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 "
3737 - env : DISTRIB="conda" PYTHON_VERSION="3.7"
38- NUMPY_VERSION="1.14.6" SCIPY_VERSION="1.1.0" SKLEARN_VERSION="0.21"
39- - env : DISTRIB="conda" PYTHON_VERSION="3.7"
40- NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="master"
38+ NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="0.21.2"
4139 allow_failures :
4240 - env : DISTRIB="conda" PYTHON_VERSION="3.7"
4341 NUMPY_VERSION="*" SCIPY_VERSION="*" SKLEARN_VERSION="master"
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
@@ -40,13 +36,10 @@ 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.
45- conda install --yes pandas keras tensorflow
46- KERAS_BACKEND=tensorflow
47- python -c " import keras.backend"
48- sed -i -e ' s/"backend":[[:space:]]*"[^"]*/"backend":\ "' $KERAS_BACKEND ' /g' ~ /.keras/keras.json;
49- fi
39+ conda install --yes pandas keras tensorflow
40+ KERAS_BACKEND=tensorflow
41+ python -c " import keras.backend"
42+ sed -i -e ' s/"backend":[[:space:]]*"[^"]*/"backend":\ "' $KERAS_BACKEND ' /g' ~ /.keras/keras.json;
5043
5144 if [[ " $SKLEARN_VERSION " == " master" ]]; then
5245 conda install --yes cython
You can’t perform that action at this time.
0 commit comments