Fix up tests and wheel dependencies

Author: matthew-brett

.travis.yml

@@ -3,9 +3,6 @@ env:
         - REPO_DIR=scipy
         - BUILD_COMMIT=v0.17.1
         - PLAT=x86_64
-        # OSX build of scipy on Python 3.5 needs patched 1.7.1 wheel to avoid
-        # https://github.com/numpy/numpy/issues/6204.  Patched numpy 1.7.1
-        # wheel for Python 3.5 at nipy manylinux URL.
         - NP_BUILD_DEP="numpy==1.7.1"
         - NP_TEST_DEP="numpy==1.7.1"
         - UNICODE_WIDTH=32
@@ -51,11 +48,13 @@ matrix:
     - os: linux
       python: 3.5
       env:
+        - NP_BUILD_DEP=numpy==1.9.3
         - NP_TEST_DEP=numpy==1.9.3
     - os: linux
       python: 3.5
       env:
         - PLAT=i686
+        - NP_BUILD_DEP=numpy==1.9.3
         - NP_TEST_DEP=numpy==1.9.3
     - os: osx
       language: objective-c
@@ -70,6 +69,10 @@ matrix:
       language: objective-c
       env:
         - TRAVIS_PYTHON_VERSION=3.5
+        # OSX build of scipy on Python 3.5 needs built 1.8.2 wheel to avoid
+        # https://github.com/numpy/numpy/issues/6204.  numpy 1.8.2 wheel for
+        # Python 3.5 at nipy manylinux URL.
+        - NP_BUILD_DEP=numpy==1.8.2
         - NP_TEST_DEP=numpy==1.9.3
 
 before_install:

config.sh

@@ -8,16 +8,23 @@ function pre_build {
         sudo installer -pkg archives/gfortran-4.2.3.pkg -target /
     else
         build_openblas
+        # Force scipy to use OpenBLAS regardless of what numpy uses
+        cat << EOF > $HOME/site.cfg
+[openblas]
+library_dirs = /usr/local/lib
+include_dirs = /usr/local/include
+EOF
     fi
 }
 
 function run_tests {
     # Runs tests on installed distribution from an empty directory
+    test_cmd="import sys; import scipy; sys.exit(not scipy.test('full').wasSuccessful())"
     if [ -n "$IS_OSX" ]; then  # Test both architectures on OSX
-        arch -i386 python -c 'import scipy; scipy.test("full")'
-        arch -x86_64 python -c 'import scipy; scipy.test("full")'
-    else  # Test both architectures on OSX
-        python -c 'import scipy; scipy.test("full")'
+        arch -i386 python -c "$test_cmd"
+        arch -x86_64 python -c "$test_cmd"
+    else  # Not OSX
+        python -c "$test_cmd"
     fi
     # Show BLAS / LAPACK used
     python -c 'import scipy; scipy.show_config()'