Merge pull request #10827 from charris/create-pytesttester

ENH: Add tester for pytest.

12 files changed, 190 insertions, 13 deletions

diff --git a/numpy/__init__.py b/numpy/__init__.py
index db99294bc..db7bc0368 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -150,7 +150,6 @@ else:
     # no-one else in the world is using it (though I hope not)
     from .testing import Tester, _numpy_tester
     test = _numpy_tester().test
-    bench = _numpy_tester().bench
 
     # Allow distributors to run custom init code
     from . import _distributor_init
diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py
index 6db484de4..264324503 100644
--- a/numpy/core/__init__.py
+++ b/numpy/core/__init__.py
@@ -73,7 +73,6 @@ __all__ += einsumfunc.__all__
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
 
 # Make it possible so that ufuncs can be pickled
 #  Here are the loading and unloading functions
diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py
index 250c4322b..86cc45b42 100644
--- a/numpy/f2py/__init__.py
+++ b/numpy/f2py/__init__.py
@@ -71,4 +71,3 @@ def compile(source,
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/fft/__init__.py b/numpy/fft/__init__.py
index 72d61a728..d1716bd4b 100644
--- a/numpy/fft/__init__.py
+++ b/numpy/fft/__init__.py
@@ -8,4 +8,3 @@ from .helper import *
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py
index cc05232a2..0c2e6dfab 100644
--- a/numpy/lib/__init__.py
+++ b/numpy/lib/__init__.py
@@ -48,4 +48,3 @@ __all__ += histograms.__all__
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/linalg/__init__.py b/numpy/linalg/__init__.py
index 2537926c5..1510a8448 100644
--- a/numpy/linalg/__init__.py
+++ b/numpy/linalg/__init__.py
@@ -52,4 +52,3 @@ from .linalg import *
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/ma/__init__.py b/numpy/ma/__init__.py
index fbefc47a4..0689f2932 100644
--- a/numpy/ma/__init__.py
+++ b/numpy/ma/__init__.py
@@ -53,4 +53,3 @@ __all__ += extras.__all__
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/matrixlib/__init__.py b/numpy/matrixlib/__init__.py
index 11dce2928..95713580d 100644
--- a/numpy/matrixlib/__init__.py
+++ b/numpy/matrixlib/__init__.py
@@ -9,4 +9,3 @@ __all__ = defmatrix.__all__
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/polynomial/__init__.py b/numpy/polynomial/__init__.py
index ae5b1f078..f7cbc19b0 100644
--- a/numpy/polynomial/__init__.py
+++ b/numpy/polynomial/__init__.py
@@ -24,4 +24,3 @@ from .laguerre import Laguerre
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/random/__init__.py b/numpy/random/__init__.py
index 869818a22..409f50ec0 100644
--- a/numpy/random/__init__.py
+++ b/numpy/random/__init__.py
@@ -119,4 +119,3 @@ def __RandomState_ctor():
 
 from numpy.testing import _numpy_tester
 test = _numpy_tester().test
-bench = _numpy_tester().bench
diff --git a/numpy/testing/_private/pytesttester.py b/numpy/testing/_private/pytesttester.py
new file mode 100644
index 000000000..6a92a52fd
--- /dev/null
+++ b/numpy/testing/_private/pytesttester.py
@@ -0,0 +1,175 @@
+"""
+Pytest test running.
+
+This module implements the ``test()`` function for NumPy modules. The usual
+boiler plate for doing that is to put the following in the module
+``__init__.py`` file::
+
+    from numpy.testing import PytestTester
+    test = PytestTester(__name__).test
+    del PytestTester
+
+
+Warnings filtering and other runtime settings should be dealt with in the
+``pytest.ini`` file in the numpy repo root. The behavior of the test depends on
+whether or not that file is found as follows:
+
+* ``pytest.ini`` is present (develop mode)
+    All warnings except those explicily filtered out are raised as error.
+* ``pytest.ini`` is absent (release mode)
+    DeprecationWarnings and PendingDeprecationWarnings are ignored, other
+    warnings are passed through.
+
+In practice, tests run from the numpy repo are run in develop mode. That
+includes the standard ``python runtests.py`` invocation.
+
+"""
+from __future__ import division, absolute_import, print_function
+
+import sys
+import os
+
+__all__ = ['PytestTester']
+
+
+def _show_numpy_info():
+    import numpy as np
+
+    print("NumPy version %s" % np.__version__)
+    relaxed_strides = np.ones((10, 1), order="C").flags.f_contiguous
+    print("NumPy relaxed strides checking option:", relaxed_strides)
+
+
+class PytestTester(object):
+    """
+    Pytest test runner.
+
+    This class is made available in ``numpy.testing``, and a test function
+    is typically added to a package's __init__.py like so::
+
+      from numpy.testing import PytestTester
+      test = PytestTester(__name__).test
+      del PytestTester
+
+    Calling this test function finds and runs all tests associated with the
+    module and all its sub-modules.
+
+    Attributes
+    ----------
+    module_name : str
+        Full path to the package to test.
+
+    Parameters
+    ----------
+    module_name : module name
+        The name of the module to test.
+
+    """
+    def __init__(self, module_name):
+        self.module_name = module_name
+
+    def test(self, label='fast', verbose=1, extra_argv=None,
+             doctests=False, coverage=False, timer=0, tests=None):
+        """
+        Run tests for module using pytest.
+
+        Parameters
+        ----------
+        label : {'fast', 'full'}, optional
+            Identifies the tests to run. When set to 'fast', tests decorated
+            with `pytest.mark.slow` are skipped, when 'full', the slow marker
+            is ignored.
+        verbose : int, optional
+            Verbosity value for test outputs, in the range 1-3. Default is 1.
+        extra_argv : list, optional
+            List with any extra arguments to pass to pytests.
+        doctests : bool, optional
+            .. note:: Not supported
+        coverage : bool, optional
+            If True, report coverage of NumPy code. Default is False.
+            Requires installation of (pip) pytest-cov.
+        timer : int, optional
+            If > 0, report the time of the slowest `timer` tests. Default is 0.
+
+        tests : test or list of tests
+            Tests to be executed with pytest '--pyargs'
+
+        Returns
+        -------
+        result : bool
+            Return True on success, false otherwise.
+
+        Notes
+        -----
+        Each NumPy module exposes `test` in its namespace to run all tests for it.
+        For example, to run all tests for numpy.lib:
+
+        >>> np.lib.test() #doctest: +SKIP
+
+        Examples
+        --------
+        >>> result = np.lib.test() #doctest: +SKIP
+        Running unit tests for numpy.lib
+        ...
+        Ran 976 tests in 3.933s
+
+        OK
+
+        >>> result.errors #doctest: +SKIP
+        []
+        >>> result.knownfail #doctest: +SKIP
+        []
+
+        """
+        import pytest
+
+        #FIXME This is no longer needed? Assume it was for use in tests.
+        # cap verbosity at 3, which is equivalent to the pytest '-vv' option
+        #from . import utils
+        #verbose = min(int(verbose), 3)
+        #utils.verbose = verbose
+        #
+
+        module = sys.modules[self.module_name]
+        module_path = os.path.abspath(module.__path__[0])
+
+        # setup the pytest arguments
+        pytest_args = ['-l']
+
+        if doctests:
+            raise ValueError("Doctests not supported")
+
+        if extra_argv:
+            pytest_args += list(extra_argv)
+
+        if verbose > 1:
+            pytest_args += ["-" + "v"*(verbose - 1)]
+        else:
+            pytest_args += ["-q"]
+
+        if coverage:
+            pytest_args += ["--cov=" + module_path]
+
+        if label == "fast":
+            pytest_args += ["-m", "not slow"]
+        elif label != "full":
+            pytest_args += ["-m", label]
+
+        if timer > 0:
+            pytest_args += ["--durations=%s" % timer]
+
+        if tests is None:
+            tests = [self.module_name]
+
+        pytest_args += ['--pyargs'] + list(tests)
+
+
+        # run tests.
+        _show_numpy_info()
+
+        try:
+            code = pytest.main(pytest_args)
+        except SystemExit as exc:
+            code = exc.code
+
+        return code == 0
diff --git a/pytest.ini b/pytest.ini
index d3d7142d4..e901beb8c 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,9 +1,21 @@
 [pytest]
+addopts = -l -q
 norecursedirs = doc tools numpy/linalg/lapack_lite numpy/core/code_generators
 doctest_optionflags = NORMALIZE_WHITESPACE
-testpaths = numpy
 
+filterwarnings =
+    error
+# Filter out annoying import messages.
+    ignore:Not importing directory
+    ignore:numpy.dtype size changed
+    ignore:numpy.ufunc size changed
+# Ignore python2.7 -3 warnings
+    ignore:sys\.exc_clear\(\) not supported in 3\.x:DeprecationWarning
+    ignore:in 3\.x, __setslice__:DeprecationWarning
+    ignore:in 3\.x, __getslice__:DeprecationWarning
+    ignore:buffer\(\) not supported in 3\.x:DeprecationWarning
+    ignore:CObject type is not supported in 3\.x:DeprecationWarning
+    ignore:comparing unequal types not supported in 3\.x:DeprecationWarning
+    ignore:the commands module has been removed in Python 3\.0:DeprecationWarning
 env =
     PYTHONHASHSEED=0
-
-# addopts = --doctest-modules --ignore=numpy/f2py/__main__.py --ignore=numpy/core/cversions.py --ignore=numpy/ma/core.py --ignore=numpy/ma/version.py --ignore=numpy/testing/utils.py --ignore=numpy/testing/decorators.py