Merge pull request scikit-learn#6315 from ogrisel/ci-0.17.X

ogrisel · ogrisel · commit 2311bab978d2 · 2016-02-09T11:40:33.000+01:00
[MRG] backport CI fixes to 0.17.X branch
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,9 @@ addons:
       - libatlas-dev
       - python-scipy
 env:
+  global:
+     - OMP_NUM_THREADS=4
+     - OPENBLAS_NUM_THREADS=4
   matrix:
     # This environment tests that scikit-learn can be built against
     # versions of numpy, scipy with ATLAS that comes with Ubuntu Precise 12.04
@@ -18,7 +21,7 @@ env:
       NUMPY_VERSION="1.6.2" SCIPY_VERSION="0.11.0"
     # This environment tests the newest supported anaconda env
     - DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"
-      NUMPY_VERSION="1.10.1" SCIPY_VERSION="0.16.0"
+      NUMPY_VERSION="1.10.2" SCIPY_VERSION="0.16.1"
 install: source continuous_integration/install.sh
 script: bash continuous_integration/test_script.sh
 after_success:
diff --git a/appveyor.yml b/appveyor.yml
@@ -48,10 +48,12 @@ install:
   # not already installed.
   - "powershell ./continuous_integration/appveyor/install.ps1"
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "python -m pip install -U pip"
 
   # Check that we have the expected version and architecture for Python
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "pip --version"
 
   # Install the build and runtime dependencies of the project.
   - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com -r continuous_integration/appveyor/requirements.txt"
diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh
@@ -29,17 +29,16 @@ if [[ "$DISTRIB" == "conda" ]]; then
 
     # Configure the conda environment and put it in the path using the
     # provided versions
-    conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
-        numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION
-    source activate testenv
-
     if [[ "$INSTALL_MKL" == "true" ]]; then
-        # Make sure that MKL is used
-        conda install --yes mkl
+        conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
+            numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION numpy scipy \
+            libgfortran mkl
     else
-        # Make sure that MKL is not used
-        conda remove --yes --features mkl || echo "MKL not installed"
+        conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
+            numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION libgfortran
     fi
+    source activate testenv
+
 
 elif [[ "$DISTRIB" == "ubuntu" ]]; then
     # At the time of writing numpy 1.9.1 is included in the travis
