TST: Patch Circle matplotlib failure

The tm.mplskip decorator was breaking on Circle,
so this commit removes the decorator and replaces it
with direct function calls to check for matplotlib.

Author: gfyoung

pandas/tests/io/formats/test_style.py

@@ -5,14 +5,13 @@
 import numpy as np
 import pandas as pd
 from pandas import DataFrame
-from pandas.util.testing import TestCase
 import pandas.util.testing as tm
 
 jinja2 = pytest.importorskip('jinja2')
 from pandas.io.formats.style import Styler, _get_level_lengths  # noqa
 
 
-class TestStyler(TestCase):
+class TestStyler(tm.TestCase):
 
     def setup_method(self, method):
         np.random.seed(24)
@@ -813,10 +812,10 @@ def test_mi_sparse_column_names(self):
         assert head == expected
 
 
-@tm.mplskip
-class TestStylerMatplotlibDep(TestCase):
+class TestStylerMatplotlibDep(tm.TestCase):
 
     def test_background_gradient(self):
+        tm._skip_if_no_mpl()
         df = pd.DataFrame([[1, 2], [2, 4]], columns=['A', 'B'])
 
         for c_map in [None, 'YlOrRd']:

pandas/tests/plotting/common.py

@@ -19,11 +19,12 @@
 import pandas.plotting as plotting
 from pandas.plotting._tools import _flatten
 
-
 """
 This is a common base class used for various plotting tests
 """
 
+tm._skip_module_if_no_mpl()
+
 
 def _skip_if_no_scipy_gaussian_kde():
     try:
@@ -41,7 +42,6 @@ def _ok_for_gaussian_kde(kind):
     return True
 
 
-@tm.mplskip
 class TestPlotBase(tm.TestCase):
 
     def setup_method(self, method):

pandas/tests/plotting/test_boxplot_method.py

@@ -21,6 +21,8 @@
 
 """ Test cases for .boxplot method """
 
+tm._skip_module_if_no_mpl()
+
 
 def _skip_if_mpl_14_or_dev_boxplot():
     # GH 8382
@@ -31,7 +33,6 @@ def _skip_if_mpl_14_or_dev_boxplot():
         pytest.skip("Matplotlib Regression in 1.4 and current dev.")
 
 
-@tm.mplskip
 class TestDataFramePlots(TestPlotBase):
 
     @slow
@@ -165,7 +166,6 @@ def test_fontsize(self):
                                 xlabelsize=16, ylabelsize=16)
 
 
-@tm.mplskip
 class TestDataFrameGroupByPlots(TestPlotBase):
 
     @slow

pandas/tests/plotting/test_datetimelike.py

@@ -20,8 +20,9 @@
 from pandas.tests.plotting.common import (TestPlotBase,
                                           _skip_if_no_scipy_gaussian_kde)
 
+tm._skip_module_if_no_mpl()
+
 
-@tm.mplskip
 class TestTSPlot(TestPlotBase):
 
     def setup_method(self, method):

pandas/tests/plotting/test_deprecated.py

@@ -18,8 +18,9 @@
 pandas.tools.plotting
 """
 
+tm._skip_module_if_no_mpl()
+
 
-@tm.mplskip
 class TestDeprecatedNameSpace(TestPlotBase):
 
     @slow

pandas/tests/plotting/test_frame.py

@@ -27,8 +27,9 @@
                                           _skip_if_no_scipy_gaussian_kde,
                                           _ok_for_gaussian_kde)
 
+tm._skip_module_if_no_mpl()
+
 
-@tm.mplskip
 class TestDataFramePlots(TestPlotBase):
 
     def setup_method(self, method):

pandas/tests/plotting/test_groupby.py

@@ -10,8 +10,9 @@
 
 from pandas.tests.plotting.common import TestPlotBase
 
+tm._skip_module_if_no_mpl()
+
 
-@tm.mplskip
 class TestDataFrameGroupByPlots(TestPlotBase):
 
     def test_series_groupby_plotting_nominally_works(self):

pandas/tests/plotting/test_hist_method.py

@@ -15,7 +15,9 @@
 from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
 
 
-@tm.mplskip
+tm._skip_module_if_no_mpl()
+
+
 class TestSeriesPlots(TestPlotBase):
 
     def setup_method(self, method):
@@ -140,7 +142,6 @@ def test_plot_fails_when_ax_differs_from_figure(self):
             self.ts.hist(ax=ax1, figure=fig2)
 
 
-@tm.mplskip
 class TestDataFramePlots(TestPlotBase):
 
     @slow
@@ -251,7 +252,6 @@ def test_tight_layout(self):
             tm.close()
 
 
-@tm.mplskip
 class TestDataFrameGroupByPlots(TestPlotBase):
 
     @slow

pandas/tests/plotting/test_misc.py

@@ -17,8 +17,9 @@
 from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
                                           _ok_for_gaussian_kde)
 
+tm._skip_module_if_no_mpl()
+
 
-@tm.mplskip
 class TestSeriesPlots(TestPlotBase):
 
     def setup_method(self, method):
@@ -50,7 +51,6 @@ def test_bootstrap_plot(self):
         _check_plot_works(bootstrap_plot, series=self.ts, size=10)
 
 
-@tm.mplskip
 class TestDataFramePlots(TestPlotBase):
 
     @slow

pandas/tests/plotting/test_series.py

@@ -22,8 +22,9 @@
                                           _skip_if_no_scipy_gaussian_kde,
                                           _ok_for_gaussian_kde)
 
+tm._skip_module_if_no_mpl()
+
 
-@tm.mplskip
 class TestSeriesPlots(TestPlotBase):
 
     def setup_method(self, method):

pandas/util/testing.py

@@ -289,36 +289,31 @@ def _skip_if_32bit():
         pytest.skip("skipping for 32 bit")
 
 
-def mplskip(cls):
-    """Skip a TestCase instance if matplotlib isn't installed"""
-
-    @classmethod
-    def setup_class(cls):
-        try:
-            import matplotlib as mpl
-            mpl.use("Agg", warn=False)
-        except ImportError:
-            import pytest
-            pytest.skip("matplotlib not installed")
+def _skip_module_if_no_mpl():
+    import pytest
 
-    cls.setup_class = setup_class
-    return cls
+    mpl = pytest.importorskip("matplotlib")
+    mpl.use("Agg", warn=False)
 
 
 def _skip_if_no_mpl():
     try:
-        import matplotlib  # noqa
+        import matplotlib as mpl
+        mpl.use("Agg", warn=False)
     except ImportError:
         import pytest
         pytest.skip("matplotlib not installed")
 
 
 def _skip_if_mpl_1_5():
-    import matplotlib
-    v = matplotlib.__version__
+    import matplotlib as mpl
+
+    v = mpl.__version__
     if v > LooseVersion('1.4.3') or v[0] == '0':
         import pytest
         pytest.skip("matplotlib 1.5")
+    else:
+        mpl.use("Agg", warn=False)
 
 
 def _skip_if_no_scipy():