Merge pull request matplotlib#4555 from astrofrog/compare-nose-dep

tacaswell · tacaswell · commit f505cd0d1d56 · 2015-06-26T09:39:41.000-04:00
ENH: No nose dependancy for matplotlib.testing.compare
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -15,7 +15,7 @@
 
 import matplotlib
 from matplotlib.compat import subprocess
-from matplotlib.testing.noseclasses import ImageComparisonFailure
+from matplotlib.testing.exceptions import ImageComparisonFailure
 from matplotlib import _png
 from matplotlib import _get_cachedir
 from matplotlib import cbook
diff --git a/lib/matplotlib/testing/exceptions.py b/lib/matplotlib/testing/exceptions.py
@@ -0,0 +1,16 @@
+class KnownFailureTest(Exception):
+    """
+    Raise this exception to mark a test as a known failing test.
+    """
+
+
+class KnownFailureDidNotFailTest(Exception):
+    """
+    Raise this exception to mark a test should have failed but did not.
+    """
+
+
+class ImageComparisonFailure(AssertionError):
+    """
+    Raise this exception to mark a test as a comparison between two images.
+    """
diff --git a/lib/matplotlib/testing/noseclasses.py b/lib/matplotlib/testing/noseclasses.py
@@ -5,17 +5,10 @@
 
 import os
 from nose.plugins.errorclass import ErrorClass, ErrorClassPlugin
+from matplotlib.testing.exceptions import (KnownFailureTest,
+                                           KnownFailureDidNotFailTest,
+                                           ImageComparisonFailure)
 
-class KnownFailureTest(Exception):
-    '''Raise this exception to mark a test as a known failing test.'''
-    pass
-
-class KnownFailureDidNotFailTest(Exception):
-    '''Raise this exception to mark a test should have failed but did not.'''
-    pass
-
-class ImageComparisonFailure(AssertionError):
-    '''Raise this exception to mark a test as a comparison between two images.'''
 
 class KnownFailure(ErrorClassPlugin):
     '''Plugin that installs a KNOWNFAIL error class for the
@@ -46,7 +39,7 @@ def configure(self, options, conf):
         if disable:
             self.enabled = False
 
-    def addError( self, test, err, *zero_nine_capt_args ):
+    def addError(self, test, err, *zero_nine_capt_args):
         # Fixme (Really weird): if I don't leave empty method here,
         # nose gets confused and KnownFails become testing errors when
         # using the MplNosePlugin and MplTestCase.
diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -194,7 +194,6 @@ def test_pep8_conformance_installed_files():
                           'type1font.py',
                           'widgets.py',
                           'testing/decorators.py',
-                          'testing/noseclasses.py',
                           'testing/jpl_units/Duration.py',
                           'testing/jpl_units/Epoch.py',
                           'testing/jpl_units/EpochConverter.py',
