Try fix for Python 3.9

matthew-brett · matthew-brett · commit 28f4c2d91cc2 · 2021-03-27T11:25:53.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -106,10 +106,6 @@ matrix:
         - MB_PYTHON_VERSION=3.9
         - NP_BUILD_DEP="numpy==1.20"
         - NP_TEST_DEP="numpy==1.20"
-        # Numpy 1.20 rejects Accelerate as installation
-        # option; disable this search.
-        - NPY_BLAS_ORDER=""
-        - NPY_LAPACK_ORDER=""
 
 before_install:
     - BUILD_DEPENDS="$NP_BUILD_DEP Cython nibabel sympy $SP_DEP"
diff --git a/config.sh b/config.sh
@@ -1,10 +1,20 @@
 # Define custom utilities
-# Test for OSX with [ -n "$IS_OSX" ]
+# Test for OSX with [ -n "$IS_MACOS" ]
 
 function pre_build {
-    # Any stuff that you need to do before you start building the wheels
+    # Any stuff that you need to do before you start
+    # building the wheels.
     # Runs in the root directory of this repository.
-    :
+    # Accelerate error only on macOS
+    if [ -z "$IS_MACOS" ]; then return; fi
+    # Only for Numpy >= 1.20
+    local np_ver=$(python -c 'import numpy; print(numpy.__version__)')
+    if [ $(lex_ver $np_ver) -lt $(lex_ver 1.20) ]; then
+        return
+    fi
+    # Just in case.
+    brew install openblas
+    cp site.cfg.openblas nipy/site.cfg
 }
 
 function run_tests {
diff --git a/site.cfg.openblas b/site.cfg.openblas
@@ -0,0 +1,5 @@
+[openblas]
+libraries = openblas
+library_dirs = /usr/local/lib
+include_dirs = /usr/local/include
+runtime_library_dirs = /usr/local/lib
