diff options
| -rwxr-xr-x | numpy/f2py/f2py2e.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_real.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py index 5732c1e19..69d946cf0 100755 --- a/numpy/f2py/f2py2e.py +++ b/numpy/f2py/f2py2e.py @@ -531,7 +531,7 @@ def run_compile(): sysinfo_flags = [f[7:] for f in sysinfo_flags] _reg2 = re.compile( - r'--((no-|)(wrap-functions|lower)|debug-capi|quiet)|-include') + r'--((no-|)(wrap-functions|lower)|debug-capi|quiet|skip-empty-wrappers)|-include') f2py_flags = [_m for _m in sys.argv[1:] if _reg2.match(_m)] sys.argv = [_m for _m in sys.argv if _m not in f2py_flags] f2py_flags2 = [] diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py index 35ab5008d..d9fecef1a 100644 --- a/numpy/f2py/tests/test_return_real.py +++ b/numpy/f2py/tests/test_return_real.py @@ -48,9 +48,9 @@ class TestReturnReal(util.F2PyTest): @pytest.mark.skipif( - platform.system() == "Darwin" or platform.system() == "Windows", + platform.system() == "Darwin", reason="Prone to error when run with numpy/f2py/tests on mac os, " - "and windows, but not when run in isolation", + "but not when run in isolation", ) class TestCReturnReal(TestReturnReal): suffix = ".pyf" |