MAINT: Fix nose features to work on pytest

MANIFEST.in

@@ -4,6 +4,7 @@
 # data, etc files to distribution. Avoid using MANIFEST.in for that.
 #
 include MANIFEST.in
+include pytest.ini
 include *.txt
 include site.cfg.example
 include numpy/random/mtrand/generate_mtrand_c.py

numpy/conftest.py

@@ -5,6 +5,7 @@
 
 import warnings
 import pytest
+import numpy
 
 from numpy.core.multiarray_tests import get_fpu_mode
 
@@ -52,3 +53,23 @@ def check_fpu_mode(request):
         raise AssertionError("FPU precision mode changed from {0:#x} to {1:#x}"
                              " when collecting the test".format(old_mode, 
                                                                 new_mode))
+
+
+def pytest_addoption(parser):
+    parser.addoption("--runslow", action="store_true",
+                     default=False, help="run slow tests")
+
+
+def pytest_collection_modifyitems(config, items):
+    if config.getoption("--runslow"):
+        # --runslow given in cli: do not skip slow tests
+        return
+    skip_slow = pytest.mark.skip(reason="need --runslow option to run")
+    for item in items:
+        if "slow" in item.keywords:
+            item.add_marker(skip_slow)
+
+
+@pytest.fixture(autouse=True)
+def add_np(doctest_namespace):
+    doctest_namespace['np'] = numpy

numpy/ma/core.py

@@ -6937,6 +6937,7 @@ def transpose(a, axes=None):
      [[False False]
      [False  True]],
            fill_value = 999999)
+
     >>> ma.transpose(x)
     masked_array(data =
      [[0 2]