Skip to content

Commit

Permalink
MAINT temporary disable MKL in Travis
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
lesteve committed Mar 8, 2016
1 parent 03a1d45 commit 2d19895
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build_tools/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2d19895

Please sign in to comment.