From 652ff076685db2254fc522e852a06ad735cf0d35 Mon Sep 17 00:00:00 2001
From: terrytangyuan <terrytangyuan@gmail.com>
Date: Wed, 21 Oct 2015 21:30:11 -0500
Subject: [PATCH] Added scikit-learn from Conda

---
 .travis.yml              | 2 +-
 scripts/travis_script.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bdced1ad9..17b9d1237 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,10 @@ addons:
       - unzip
       - python-numpy
       - python-scipy
-      - python-sklearn
 
 before_install:
   - scripts/travis_osx_install.sh
+  - scripts/travis_script.sh
   - git clone https://github.com/dmlc/dmlc-core
   - export TRAVIS=dmlc-core/scripts/travis/
   - export PYTHONPATH=${PYTHONPATH}:${PWD}/python-package
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 3a026966d..1e62b5b46 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -64,7 +64,7 @@ if [ ${TASK} == "python-package" -o ${TASK} == "python-package3" ]; then
         conda create -n myenv python=2.7
     fi
     source activate myenv
-    conda install numpy scipy pandas matplotlib nose
+    conda install numpy scipy pandas matplotlib nose scikit-learn
     python -m pip install graphviz
 
     make all CXX=${CXX} || exit -1