diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2018-03-25 12:34:16 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2018-04-04 06:36:36 -0600 |
commit | 7e5a41de9fab731e27a761c01302a0a93e2d1070 (patch) | |
tree | dbd6265800ad401476bcde904e9bba86f6af2b85 /numpy/f2py/tests/util.py | |
parent | 359e53ef8e479eefac0e184d4d25af50c2779ce0 (diff) | |
download | numpy-7e5a41de9fab731e27a761c01302a0a93e2d1070.tar.gz |
TST: Switch to using pytest markers
Use standard pytest markers everywhere in the numpy tests. At this point
there should be no nose dependency. However, nose is required to test
the legacy decorators if so desired.
At this point, numpy test cannot be run in the way with runtests, rather
installed numpy can be tested with `pytest --pyargs numpy` as long as
that is not run from the repo. Run it from the tools directory or some
such.
Diffstat (limited to 'numpy/f2py/tests/util.py')
-rw-r--r-- | numpy/f2py/tests/util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py index 881b32810..466fd4970 100644 --- a/numpy/f2py/tests/util.py +++ b/numpy/f2py/tests/util.py @@ -16,10 +16,11 @@ import atexit import textwrap import re import random +import pytest import numpy.f2py from numpy.compat import asbytes, asstr -from numpy.testing import SkipTest, temppath, dec +from numpy.testing import SkipTest, temppath from importlib import import_module try: @@ -319,8 +320,10 @@ class F2PyTest(object): module = None module_name = None - @dec.knownfailureif(sys.platform=='win32', msg='Fails with MinGW64 Gfortran (Issue #9673)') def setup(self): + if sys.platform == 'win32': + raise SkipTest('Fails with MinGW64 Gfortran (Issue #9673)') + if self.module is not None: return |