Remove matplotlib.decorators.skipif.

QuLogic · QuLogic · commit ca4d87a61bc7 · 2017-01-27T18:46:26.000-05:00
It's a compatibility wrapper around nose/pytest, but has never been
released.
diff --git a/lib/matplotlib/testing/_nose/decorators.py b/lib/matplotlib/testing/_nose/decorators.py
@@ -9,45 +9,6 @@
 from .exceptions import KnownFailureDidNotFailTest
 
 
-def skipif(skip_condition, *args, **kwargs):
-    if isinstance(skip_condition, bool) and 'reason' not in kwargs:
-        raise ValueError("you need to specify reason=STRING "
-                         "when using booleans as conditions.")
-
-    def skip_decorator(func):
-        import inspect
-
-        def skipper(*_args, **_kwargs):
-            condition, msg = skip_condition, kwargs.get('reason')  # local copy
-            if isinstance(condition, six.string_types):
-                globs = {'os': os, 'sys': sys}
-                try:
-                    globs.update(func.__globals__)
-                except AttributeError:
-                    globs.update(func.func_globals)
-                if msg is None:
-                    msg = condition
-                condition = eval(condition, globs)
-            else:
-                condition = bool(condition)
-
-            if condition:
-                skip(msg)
-            else:
-                return func(*_args, **_kwargs)
-
-        if inspect.isclass(func):
-            setup = getattr(func, 'setup_class', classmethod(lambda _: None))
-            setup = skip_decorator(setup.__func__)
-            setup = setup.__get__(func)
-            setattr(func, 'setup_class', setup)
-            return func
-
-        return copy_metadata(func, skipper)
-
-    return skip_decorator
-
-
 def knownfailureif(fail_condition, msg=None, known_exception_class=None):
     # based on numpy.testing.dec.knownfailureif
     if msg is None:
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -30,20 +30,6 @@
 from .exceptions import ImageComparisonFailure
 
 
-def skipif(condition, *args, **kwargs):
-    """Skip the given test function if eval(condition) results in a True
-    value.
-
-    Optionally specify a reason for better reporting.
-    """
-    if is_called_from_pytest():
-        import pytest
-        return pytest.mark.skipif(condition, *args, **kwargs)
-    else:
-        from ._nose.decorators import skipif
-        return skipif(condition, *args, **kwargs)
-
-
 def knownfailureif(fail_condition, msg=None, known_exception_class=None):
     """
 
@@ -516,6 +502,7 @@ def skip_if_command_unavailable(cmd):
     try:
         check_output(cmd)
     except:
-        return skipif(True, reason='missing command: %s' % cmd[0])
+        import pytest
+        return pytest.mark.skip(reason='missing command: %s' % cmd[0])
 
     return lambda f: f
diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py
@@ -4,53 +4,11 @@
 import six
 import sys
 
-from ..testing.decorators import skipif
-
-
-SKIPIF_CONDITION = []
-
-
-def setup_module():
-    SKIPIF_CONDITION.append(None)
-
 
 def test_simple():
     assert 1 + 1 == 2
 
 
-@skipif(True, reason="skipif decorator test with bool condition passed")
-def test_skipif_bool():
-    assert False, "skipif decorator does not work with bool condition"
-
-
-@skipif('SKIPIF_CONDITION',
-        reason="skipif decorator test with string condition passed")
-def test_skipif_string():
-    assert False, "skipif decorator does not work with string condition"
-
-
-@skipif(True, reason="skipif decorator on class test passed")
-class Test_skipif_on_class(object):
-    def test(self):
-        assert False, "skipif decorator does not work on classes"
-
-
-class Test_skipif_on_method(object):
-    @skipif(True, reason="skipif decorator on method test passed")
-    def test(self):
-        assert False, "skipif decorator does not work on methods"
-
-
-@skipif(True, reason="skipif decorator on classmethod test passed")
-class Test_skipif_on_classmethod(object):
-    @classmethod
-    def setup_class(cls):
-        pass
-
-    def test(self):
-        assert False, "skipif decorator does not work on classmethods"
-
-
 def test_override_builtins():
     import pylab
 
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -8,11 +8,12 @@
 import tempfile
 import warnings
 
+import pytest
+
 from matplotlib.font_manager import (
     findfont, FontProperties, fontManager, json_dump, json_load, get_font,
     get_fontconfig_fonts, is_opentype_cff_font, fontManager as fm)
 from matplotlib import rc_context
-from matplotlib.testing.decorators import skipif
 
 
 def test_font_priority():
@@ -64,6 +65,6 @@ def test_otf():
         assert res == is_opentype_cff_font(f)
 
 
-@skipif(sys.platform == 'win32', reason='no fontconfig on Windows')
+@pytest.mark.skipif(sys.platform == 'win32', reason='no fontconfig on Windows')
 def test_get_fontconfig_fonts():
     assert len(get_fontconfig_fonts()) > 1
