MAINT temporary disable MKL in Travis

lesteve · lesteve · commit 2d198950dc94 · 2016-03-09T00:43:37.000+01:00
to have master green on Travis until we fix scikit-learn#6279. Install nomkl when INSTALL_MKL is not true. DISTRIB=scipy-dev-wheels uses allow_failures.
diff --git a/.travis.yml b/.travis.yml
@@ -39,11 +39,16 @@ env:
       NUMPY_VERSION="1.6.2" SCIPY_VERSION="0.11.0" CYTHON_VERSION="0.21"
       CACHED_BUILD_DIR="$HOME/sklearn_build_oldest"
     # This environment tests the newest supported anaconda env
-    - DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"
+    - DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="false"
       NUMPY_VERSION="1.10.2" SCIPY_VERSION="0.16.1" CYTHON_VERSION="0.23.4"
       CACHED_BUILD_DIR="$HOME/sklearn_build_latest"
 
 matrix:
+  allow_failures:
+    # allow_failures seems to be keyed on the python version
+    # We are using this to allow failures for DISTRIB=scipy-dev-wheels
+    - python: 3.5
+
   include:
     # This environment tests scikit-learn against numpy and scipy master
     # installed from their CI wheels in a virtualenv with the Python
diff --git a/build_tools/travis/install.sh b/build_tools/travis/install.sh
@@ -57,7 +57,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
     else
         conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
             numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION \
-            libgfortran
+            libgfortran nomkl
     fi
     source activate testenv
 
