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/tests/test_scripts.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/tests/test_scripts.py')
-rw-r--r-- | numpy/tests/test_scripts.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/numpy/tests/test_scripts.py b/numpy/tests/test_scripts.py index 675fe6575..ee09390c7 100644 --- a/numpy/tests/test_scripts.py +++ b/numpy/tests/test_scripts.py @@ -4,14 +4,15 @@ Test that we can run executable scripts that have been installed with numpy. """ from __future__ import division, print_function, absolute_import +import sys import os +import pytest from os.path import join as pathjoin, isfile, dirname, basename -import sys from subprocess import Popen, PIPE + import numpy as np from numpy.compat.py3k import basestring -from nose.tools import assert_equal -from numpy.testing import assert_, dec +from numpy.testing import assert_, assert_equal is_inplace = isfile(pathjoin(dirname(np.__file__), '..', 'setup.py')) @@ -58,7 +59,7 @@ def run_command(cmd, check_code=True): return proc.returncode, stdout, stderr -@dec.skipif(is_inplace) +@pytest.mark.skipif(is_inplace, reason="Cannot test f2py command inplace") def test_f2py(): # test that we can run f2py script if sys.platform == 'win32': |