Move test to tests/plotting

Author: jorisvandenbossche

pandas/plotting/compat.py

@@ -49,3 +49,11 @@ def _mpl_ge_2_0_0():
         return matplotlib.__version__ >= LooseVersion('2.0')
     except ImportError:
         return False
+
+
+def _mpl_ge_2_0_1():
+    try:
+        import matplotlib
+        return matplotlib.__version__ >= LooseVersion('2.0.1')
+    except ImportError:
+        return False

pandas/plotting/core.py

@@ -36,15 +36,6 @@
                                    format_date_labels)
 
 
-
-def _mpl_ge_2_0_1():
-    try:
-        import matplotlib
-        return matplotlib.__version__ >= LooseVersion('2.0.1')
-    except ImportError:
-        return False
-
-
 if _mpl_ge_1_5_0():
     # Compat with mp 1.5, which uses cycler.
     import cycler

pandas/plotting/tests/__init__.py renamed to pandas/tests/plotting/__init__.py

@@ -16,7 +16,7 @@
 
 import pandas.plotting as plotting
 
-from pandas.plotting.tests.common import (TestPlotBase, _check_plot_works)
+from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
 
 
 """ Test cases for .boxplot method """

pandas/plotting/tests/common.py renamed to pandas/tests/plotting/common.py

@@ -17,7 +17,7 @@
 from pandas.util.testing import assert_series_equal, ensure_clean, slow
 import pandas.util.testing as tm
 
-from pandas.plotting.tests.common import (TestPlotBase,
+from pandas.tests.plotting.common import (TestPlotBase,
                                           _skip_if_no_scipy_gaussian_kde)
 
 

pandas/plotting/tests/test_boxplot_method.py renamed to pandas/tests/plotting/test_boxplot_method.py

@@ -12,7 +12,7 @@
 
 import pandas.tools.plotting as plotting
 
-from pandas.plotting.tests.common import TestPlotBase
+from pandas.tests.plotting.common import TestPlotBase
 
 
 """
@@ -62,6 +62,12 @@ def test_radviz_deprecated(self):
         with tm.assert_produces_warning(FutureWarning):
             plotting.radviz(frame=df, class_column='Name')
 
+    @slow
+    def test_plot_params(self):
+
+        with tm.assert_produces_warning(FutureWarning):
+            pd.plot_params['xaxis.compat'] = True
+
 
 if __name__ == '__main__':
     nose.runmodule(argv=[__file__, '-vvs', '-x', '--pdb', '--pdb-failure'],

pandas/plotting/tests/test_converter.py renamed to pandas/tests/plotting/test_converter.py

@@ -23,7 +23,7 @@
 from numpy.random import rand, randn
 
 import pandas.plotting as plotting
-from pandas.plotting.tests.common import (TestPlotBase, _check_plot_works,
+from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
                                           _skip_if_no_scipy_gaussian_kde,
                                           _ok_for_gaussian_kde)
 
@@ -240,21 +240,21 @@ def test_xcompat(self):
         self.assertNotIsInstance(lines[0].get_xdata(), PeriodIndex)
 
         tm.close()
-        pd.plot_params['xaxis.compat'] = True
+        pd.plotting.plot_params['xaxis.compat'] = True
         ax = df.plot()
         lines = ax.get_lines()
         self.assertNotIsInstance(lines[0].get_xdata(), PeriodIndex)
 
         tm.close()
-        pd.plot_params['x_compat'] = False
+        pd.plotting.plot_params['x_compat'] = False
         ax = df.plot()
         lines = ax.get_lines()
         self.assertNotIsInstance(lines[0].get_xdata(), PeriodIndex)
         self.assertIsInstance(PeriodIndex(lines[0].get_xdata()), PeriodIndex)
 
         tm.close()
         # useful if you're plotting a bunch together
-        with pd.plot_params.use('x_compat', True):
+        with pd.plotting.plot_params.use('x_compat', True):
             ax = df.plot()
             lines = ax.get_lines()
             self.assertNotIsInstance(lines[0].get_xdata(), PeriodIndex)

pandas/plotting/tests/test_datetimelike.py renamed to pandas/tests/plotting/test_datetimelike.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 
-from pandas.plotting.tests.common import TestPlotBase
+from pandas.tests.plotting.common import TestPlotBase
 
 
 @tm.mplskip

pandas/plotting/tests/test_deprecated.py renamed to pandas/tests/plotting/test_deprecated.py

@@ -10,7 +10,7 @@
 from numpy.random import randn
 
 import pandas.plotting as plotting
-from pandas.plotting.tests.common import (TestPlotBase, _check_plot_works)
+from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
 
 
 @tm.mplskip

pandas/plotting/tests/test_frame.py renamed to pandas/tests/plotting/test_frame.py

@@ -12,7 +12,7 @@
 from numpy.random import randn
 
 import pandas.plotting as plotting
-from pandas.plotting.tests.common import (TestPlotBase, _check_plot_works,
+from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
                                           _ok_for_gaussian_kde)
 
 

pandas/plotting/tests/test_groupby.py renamed to pandas/tests/plotting/test_groupby.py

@@ -17,7 +17,7 @@
 from numpy.random import randn
 
 import pandas.plotting as plotting
-from pandas.plotting.tests.common import (TestPlotBase, _check_plot_works,
+from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works,
                                           _skip_if_no_scipy_gaussian_kde,
                                           _ok_for_gaussian_kde)
 

pandas/plotting/tests/test_hist_method.py renamed to pandas/tests/plotting/test_hist_method.py

@@ -675,7 +675,6 @@ def pxd(name):
                 'pandas.tests.tools',
                 'pandas.tests.types',
                 'pandas.tests.plotting',
-                'pandas.tests.test_msgpack',
                 'pandas.tools',
                 'pandas.tseries',
                 'pandas.types',