Remove nose/pytest compatibility functions.

QuLogic · QuLogic · commit 481c826c2ca3 · 2017-01-27T18:46:29.000-05:00
They've never been released and are no longer used.
diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py
@@ -20,28 +20,6 @@ def is_called_from_pytest():
     return getattr(matplotlib, '_called_from_pytest', False)
 
 
-def xfail(msg=""):
-    """Explicitly fail an currently-executing test with the given message."""
-    __tracebackhide__ = True
-    if is_called_from_pytest():
-        import pytest
-        pytest.xfail(msg)
-    else:
-        from .nose import knownfail
-        knownfail(msg)
-
-
-def skip(msg=""):
-    """Skip an executing test with the given message."""
-    __tracebackhide__ = True
-    if is_called_from_pytest():
-        import pytest
-        pytest.skip(msg)
-    else:
-        from nose import SkipTest
-        raise SkipTest(msg)
-
-
 # stolen from pytest
 def getrawcode(obj, trycall=True):
     """Return code object for given function."""
diff --git a/lib/matplotlib/testing/_nose/decorators.py b/lib/matplotlib/testing/_nose/decorators.py
@@ -4,7 +4,7 @@
 import os
 import six
 import sys
-from .. import copy_metadata, skip
+from .. import copy_metadata
 from . import knownfail
 from .exceptions import KnownFailureDidNotFailTest
 
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -26,7 +26,7 @@
 from matplotlib import ft2font
 from matplotlib.testing.compare import comparable_formats, compare_images, \
      make_test_filename
-from . import copy_metadata, is_called_from_pytest, xfail
+from . import copy_metadata, is_called_from_pytest
 from .exceptions import ImageComparisonFailure
 
 
@@ -270,9 +270,10 @@ def copy_baseline(self, baseline, extension):
         if os.path.exists(orig_expected_fname):
             shutil.copyfile(orig_expected_fname, expected_fname)
         else:
-            xfail("Do not have baseline image {0} because this "
-                  "file does not exist: {1}".format(expected_fname,
-                                                    orig_expected_fname))
+            from .nose import knownfail
+            knownfail("Do not have baseline image {0} because this "
+                      "file does not exist: {1}".format(expected_fname,
+                                                        orig_expected_fname))
         return expected_fname
 
     def compare(self, idx, baseline, extension):
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -11,7 +11,6 @@
 from matplotlib.image import imread
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 from matplotlib.figure import Figure
-from matplotlib.testing import skip
 from matplotlib.testing.decorators import cleanup, image_comparison
 from matplotlib import pyplot as plt
 from matplotlib import collections
@@ -181,7 +180,7 @@ def process_image(self, padded_src, dpi):
             return t2
 
     if LooseVersion(np.__version__) < LooseVersion('1.7.0'):
-        skip('Disabled on Numpy < 1.7.0')
+        pytest.skip('Disabled on Numpy < 1.7.0')
 
     fig = plt.figure()
     ax = fig.add_subplot(111)
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -13,7 +13,6 @@
 import matplotlib as mpl
 from matplotlib import pyplot as plt
 from matplotlib import animation
-from matplotlib.testing import xfail, skip
 from matplotlib.testing.decorators import cleanup
 
 
@@ -121,7 +120,7 @@ def test_save_animation_smoketest(tmpdir, writer, extension):
     except AttributeError:
         pass
     if not animation.writers.is_available(writer):
-        skip("writer '%s' not available on this system" % writer)
+        pytest.skip("writer '%s' not available on this system" % writer)
     fig, ax = plt.subplots()
     line, = ax.plot([], [])
 
@@ -145,8 +144,8 @@ def animate(i):
         try:
             anim.save('movie.' + extension, fps=30, writer=writer, bitrate=500)
         except UnicodeDecodeError:
-            xfail("There can be errors in the numpy import stack, "
-                  "see issues #1891 and #2679")
+            pytest.xfail("There can be errors in the numpy import stack, "
+                         "see issues #1891 and #2679")
 
 
 @cleanup
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -21,7 +21,6 @@
 
 import matplotlib
 from matplotlib.testing.decorators import image_comparison, cleanup
-from matplotlib.testing import skip
 import matplotlib.pyplot as plt
 import matplotlib.markers as mmarkers
 import matplotlib.patches as mpatches
@@ -90,7 +89,7 @@ def test_formatter_ticker():
 def test_formatter_large_small():
     # github issue #617, pull #619
     if LooseVersion(np.__version__) >= LooseVersion('1.11.0'):
-        skip("Fall out from a fixed numpy bug")
+        pytest.skip("Fall out from a fixed numpy bug")
     fig, ax = plt.subplots(1)
     x = [0.500000001, 0.500000002]
     y = [1e64, 1.1e64]
diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -5,7 +5,6 @@
 import os
 
 import pytest
-from ..testing import xfail
 
 try:
     import pep8
@@ -249,8 +248,8 @@ def test_pep8_conformance_examples():
             fp, tail = os.path.split(fp)
 
     if mpldir is None:
-        xfail("can not find the examples, set env MPL_REPO_DIR to point "
-              "to the top-level path of the source tree")
+        pytest.xfail("can not find the examples, set env MPL_REPO_DIR to "
+                     "point to the top-level path of the source tree")
 
     exdir = os.path.join(mpldir, 'examples')
     blacklist = ()
