8000 TST: Skip cygwin better [f2py] · numpy/numpy@ad469a4 · GitHub
[go: up one dir, main page]

Skip to content

Commit ad469a4

Browse files
committed
TST: Skip cygwin better [f2py]
1 parent a67f202 commit ad469a4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

numpy/f2py/tests/test_array_from_pyobj.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def setup_module():
3838
if not util.has_f90_compiler():
3939
pytest.skip("No Fortran 90 compiler available")
4040

41-
if sys.platform.startswith('cygwin'):
41+
if sys.platform == 'cygwin':
4242
pytest.skip("Meson too old for cygwin CI")
4343

4444
if wrap is None:

numpy/f2py/tests/util.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ def __init__(self):
257257
self.has_f90 = False
258258

259259
def check_compilers(self):
260-
if not self.compilers_checked:
261-
self.has_c = check_language('c')
262-
self.has_f77 = check_language('fortran', fortran77_code)
263-
self.has_f90 = check_language('fortran', fortran90_code)
260+
if (not self.compilers_checked) and (not sys.platform == "cygwin"):
261+
self.has_c = check_language("c")
262+
self.has_f77 = check_language("fortran", fortran77_code)
263+
self.has_f90 = check_language("fortran", fortran90_code)
264264
self.compilers_checked = True
265265

266266
checker = CompilerChecker()
@@ -352,8 +352,8 @@ def module_name(self):
352352
def setup_method(self):
353353
if sys.platform == "win32":
354354
pytest.skip("Fails with MinGW64 Gfortran (Issue #9673)")
355-
if sys.platform.startswith('cygwin'):
356-
pytest.skip("Meson too old for cygwin CI")
355+
if sys.platform == 'cygwin':
356+
pytest.skip("Cygwin doesn't find meson")
357357

358358
if self.module is not None:
359359
return

0 commit comments

Comments
 (0)
0