Merge pull request numpy#17346 from BvB93/build-fix

BLD,BUG: Fix a macOS build failure when `NPY_BLAS_ORDER=""`
quique · Sep 18, 2020 · 385575f · 385575f
2 parents c6853c7 + 6d3a9d7
commit 385575f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
@@ -471,6 +471,9 @@ def _parse_env_order(base_order, env):
         allow_order = base_order.copy()
 
         for order in orders:
+            if not order:
+                continue
+
             if order not in base_order:
                 unknown_order.append(order)
                 continue
@@ -482,6 +485,9 @@ def _parse_env_order(base_order, env):
         allow_order = []
 
         for order in orders:
+            if not order:
+                continue
+
             if order not in base_order:
                 unknown_order.append(order)
                 continue

diff --git a/numpy/distutils/tests/test_system_info.py b/numpy/distutils/tests/test_system_info.py
@@ -284,7 +284,7 @@ def test_overrides(self):
             assert info.get_lib_dirs() == lib_dirs
         finally:
             os.chdir(previousDir)
-        
+
 
 def test_distutils_parse_env_order(monkeypatch):
     from numpy.distutils.system_info import _parse_env_order
@@ -298,6 +298,12 @@ def test_distutils_parse_env_order(monkeypatch):
     assert order == list('bef')
     assert len(unknown) == 1
 
+    # For when LAPACK/BLAS optimization is disabled
+    monkeypatch.setenv(env, '')
+    order, unknown = _parse_env_order(base_order, env)
+    assert len(order) == 0
+    assert len(unknown) == 0
+
     for prefix in '^!':
         monkeypatch.setenv(env, f'{prefix}b,i,e')
         order, unknown = _parse_env_order(base_order, env)