diff options
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': |