CI test master scikit-learn

Author: glemaitre

.travis.yml

@@ -38,6 +38,8 @@ env:
       NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.18.2"
     - DISTRIB="conda" PYTHON_VERSION="3.6"
       NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="0.18.2"
+    - DISTRIB="conda" PYTHON_VERSION="3.6"
+      NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" SKLEARN_VERSION="master"
 
 install: source build_tools/travis/install.sh
 script: bash build_tools/travis/test_script.sh

build_tools/travis/install.sh

@@ -38,8 +38,14 @@ if [[ "$DISTRIB" == "conda" ]]; then
     # provided versions
     conda create -n testenv --yes python=$PYTHON_VERSION pip
     source activate testenv
-    conda install --yes numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
-          scikit-learn=$SKLEARN_VERSION
+    conda install --yes numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION
+
+    if [[ "$SKLEARN_VERSION" == "master" ]]; then
+        pip install -U git+https://github.com/scikit-learn/scikit-learn.git
+    else
+        conda install --yes scikit-learn=$SKLEARN_VERSION
+    fi
+
     conda install --yes nose pytest pytest-cov
     # Install nose-timer via pip
     pip install nose-timer codecov