Remove mpl compat code

Author: h-vetinari

pandas/plotting/_compat.py

@@ -18,14 +18,6 @@ def inner():
     return inner
 
 
-_mpl_ge_1_2_1 = _mpl_version('1.2.1', operator.ge)
-_mpl_le_1_2_1 = _mpl_version('1.2.1', operator.le)
-_mpl_ge_1_3_1 = _mpl_version('1.3.1', operator.ge)
-_mpl_ge_1_4_0 = _mpl_version('1.4.0', operator.ge)
-_mpl_ge_1_4_1 = _mpl_version('1.4.1', operator.ge)
-_mpl_ge_1_5_0 = _mpl_version('1.5.0', operator.ge)
-_mpl_ge_2_0_0 = _mpl_version('2.0.0', operator.ge)
-_mpl_le_2_0_0 = _mpl_version('2.0.0', operator.le)
 _mpl_ge_2_0_1 = _mpl_version('2.0.1', operator.ge)
 _mpl_ge_2_1_0 = _mpl_version('2.1.0', operator.ge)
 _mpl_ge_2_2_0 = _mpl_version('2.2.0', operator.ge)

pandas/plotting/_converter.py

@@ -35,8 +35,6 @@
 from pandas.tseries.frequencies import FreqGroup
 from pandas.core.indexes.period import Period, PeriodIndex
 
-from pandas.plotting._compat import _mpl_le_2_0_0
-
 # constants
 HOURS_PER_DAY = 24.
 MIN_PER_HOUR = 60.
@@ -371,13 +369,6 @@ def __init__(self, locator, tz=None, defaultfmt='%Y-%m-%d'):
         if self._tz is dates.UTC:
             self._tz._utcoffset = self._tz.utcoffset(None)
 
-        # For mpl > 2.0 the format strings are controlled via rcparams
-        # so do not mess with them.  For mpl < 2.0 change the second
-        # break point and add a musec break point
-        if _mpl_le_2_0_0():
-            self.scaled[1. / SEC_PER_DAY] = '%H:%M:%S'
-            self.scaled[1. / MUSEC_PER_DAY] = '%H:%M:%S.%f'
-
 
 class PandasAutoDateLocator(dates.AutoDateLocator):
 

pandas/plotting/_core.py

@@ -30,10 +30,7 @@
 
 from pandas.io.formats.printing import pprint_thing
 
-from pandas.plotting._compat import (_mpl_ge_1_3_1,
-                                     _mpl_ge_1_5_0,
-                                     _mpl_ge_2_0_0,
-                                     _mpl_ge_3_0_0)
+from pandas.plotting._compat import _mpl_ge_3_0_0
 from pandas.plotting._style import (plot_params,
                                     _get_standard_colors)
 from pandas.plotting._tools import (_subplots, _flatten, table,
@@ -551,14 +548,6 @@ def plt(self):
         import matplotlib.pyplot as plt
         return plt
 
-    @staticmethod
-    def mpl_ge_1_3_1():
-        return _mpl_ge_1_3_1()
-
-    @staticmethod
-    def mpl_ge_1_5_0():
-        return _mpl_ge_1_5_0()
-
     _need_to_set_index = False
 
     def _get_xticks(self, convert_period=False):
@@ -908,8 +897,7 @@ def _make_plot(self):
         scatter = ax.scatter(data[x].values, data[y].values, c=c_values,
                              label=label, cmap=cmap, **self.kwds)
         if cb:
-            if self.mpl_ge_1_3_1():
-                cbar_label = c if c_is_column else ''
+            cbar_label = c if c_is_column else ''
             self._plot_colorbar(ax, label=cbar_label)
 
         if label is not None:
@@ -1012,10 +1000,9 @@ def _make_plot(self):
                              **kwds)
             self._add_legend_handle(newlines[0], label, index=i)
 
-            if not _mpl_ge_2_0_0():
-                lines = _get_all_lines(ax)
-                left, right = _get_xlim(lines)
-                ax.set_xlim(left, right)
+            lines = _get_all_lines(ax)
+            left, right = _get_xlim(lines)
+            ax.set_xlim(left, right)
 
     @classmethod
     def _plot(cls, ax, x, y, style=None, column_num=None,
@@ -1141,8 +1128,7 @@ def _plot(cls, ax, x, y, style=None, column_num=None,
 
         # need to remove label, because subplots uses mpl legend as it is
         line_kwds = kwds.copy()
-        if cls.mpl_ge_1_5_0():
-            line_kwds.pop('label')
+        line_kwds.pop('label')
         lines = MPLPlot._plot(ax, x, y_values, style=style, **line_kwds)
 
         # get data from the line to get coordinates for fill_between
@@ -1165,17 +1151,10 @@ def _plot(cls, ax, x, y, style=None, column_num=None,
         cls._update_stacker(ax, stacking_id, y)
 
         # LinePlot expects list of artists
-        res = [rect] if cls.mpl_ge_1_5_0() else lines
+        res = [rect]
         return res
 
     def _add_legend_handle(self, handle, label, index=None):
-        if not self.mpl_ge_1_5_0():
-            from matplotlib.patches import Rectangle
-            # Because fill_between isn't supported in legend,
-            # specifically add Rectangle handle here
-            alpha = self.kwds.get('alpha', None)
-            handle = Rectangle((0, 0), 1, 1, fc=handle.get_color(),
-                               alpha=alpha)
         LinePlot._add_legend_handle(self, handle, label, index=index)
 
     def _post_plot_logic(self, ax, data):

pandas/plotting/_style.py

@@ -4,14 +4,12 @@
 
 import warnings
 from contextlib import contextmanager
-import re
 
 import numpy as np
 
 from pandas.core.dtypes.common import is_list_like
 from pandas.compat import lrange, lmap
 import pandas.compat as compat
-from pandas.plotting._compat import _mpl_ge_2_0_0
 
 
 def _get_standard_colors(num_colors=None, colormap=None, color_type='default',
@@ -72,18 +70,9 @@ def _maybe_valid_colors(colors):
         # check whether each character can be convertible to colors
         maybe_color_cycle = _maybe_valid_colors(list(colors))
         if maybe_single_color and maybe_color_cycle and len(colors) > 1:
-            # Special case for single str 'CN' match and convert to hex
-            # for supporting matplotlib < 2.0.0
-            if re.match(r'\AC[0-9]\Z', colors) and _mpl_ge_2_0_0():
-                hex_color = [c['color']
-                             for c in list(plt.rcParams['axes.prop_cycle'])]
-                colors = [hex_color[int(colors[1])]]
-            else:
-                # this may no longer be required
-                msg = ("'{0}' can be parsed as both single color and "
-                       "color cycle. Specify each color using a list "
-                       "like ['{0}'] or {1}")
-                raise ValueError(msg.format(colors, list(colors)))
+            hex_color = [c['color']
+                         for c in list(plt.rcParams['axes.prop_cycle'])]
+            colors = [hex_color[int(colors[1])]]
         elif maybe_single_color:
             colors = [colors]
         else:

pandas/tests/plotting/common.py

@@ -39,7 +39,7 @@ def _ok_for_gaussian_kde(kind):
         except ImportError:
             return False
 
-    return plotting._compat._mpl_ge_1_5_0()
+    return True
 
 
 @td.skip_if_no_mpl
@@ -50,31 +50,14 @@ def setup_method(self, method):
         import matplotlib as mpl
         mpl.rcdefaults()
 
-        self.mpl_le_1_2_1 = plotting._compat._mpl_le_1_2_1()
-        self.mpl_ge_1_3_1 = plotting._compat._mpl_ge_1_3_1()
-        self.mpl_ge_1_4_0 = plotting._compat._mpl_ge_1_4_0()
-        self.mpl_ge_1_5_0 = plotting._compat._mpl_ge_1_5_0()
-        self.mpl_ge_2_0_0 = plotting._compat._mpl_ge_2_0_0()
         self.mpl_ge_2_0_1 = plotting._compat._mpl_ge_2_0_1()
         self.mpl_ge_2_2_0 = plotting._compat._mpl_ge_2_2_0()
         self.mpl_ge_3_0_0 = plotting._compat._mpl_ge_3_0_0()
 
-        if self.mpl_ge_1_4_0:
-            self.bp_n_objects = 7
-        else:
-            self.bp_n_objects = 8
-        if self.mpl_ge_1_5_0:
-            # 1.5 added PolyCollections to legend handler
-            # so we have twice as many items.
-            self.polycollection_factor = 2
-        else:
-            self.polycollection_factor = 1
-
-        if self.mpl_ge_2_0_0:
-            self.default_figsize = (6.4, 4.8)
-        else:
-            self.default_figsize = (8.0, 6.0)
-        self.default_tick_position = 'left' if self.mpl_ge_2_0_0 else 'default'
+        self.bp_n_objects = 7
+        self.polycollection_factor = 2
+        self.default_figsize = (6.4, 4.8)
+        self.default_tick_position = 'left'
 
         n = 100
         with tm.RNGContext(42):
@@ -462,7 +445,7 @@ def _check_box_return_type(self, returned, return_type, expected_keys=None,
                     assert isinstance(value.lines, dict)
                 elif return_type == 'dict':
                     line = value['medians'][0]
-                    axes = line.axes if self.mpl_ge_1_5_0 else line.get_axes()
+                    axes = line.axes
                     if check_ax_title:
                         assert axes.get_title() == key
                 else:
@@ -510,20 +493,6 @@ def is_grid_on():
                 obj.plot(kind=kind, grid=True, **kws)
                 assert is_grid_on()
 
-    def _maybe_unpack_cycler(self, rcParams, field='color'):
-        """
-        Compat layer for MPL 1.5 change to color cycle
-
-        Before: plt.rcParams['axes.color_cycle'] -> ['b', 'g', 'r'...]
-        After : plt.rcParams['axes.prop_cycle'] -> cycler(...)
-        """
-        if self.mpl_ge_1_5_0:
-            cyl = rcParams['axes.prop_cycle']
-            colors = [v[field] for v in cyl]
-        else:
-            colors = rcParams['axes.color_cycle']
-        return colors
-
 
 def _check_plot_works(f, filterwarnings='always', **kwargs):
     import matplotlib.pyplot as plt

pandas/tests/plotting/test_boxplot_method.py

@@ -3,7 +3,6 @@
 import pytest
 import itertools
 import string
-from distutils.version import LooseVersion
 
 from pandas import Series, DataFrame, MultiIndex
 from pandas.compat import range, lzip
@@ -21,15 +20,6 @@
 """ Test cases for .boxplot method """
 
 
-def _skip_if_mpl_14_or_dev_boxplot():
-    # GH 8382
-    # Boxplot failures on 1.4 and 1.4.1
-    # Don't need try / except since that's done at class level
-    import matplotlib
-    if LooseVersion(matplotlib.__version__) >= LooseVersion('1.4'):
-        pytest.skip("Matplotlib Regression in 1.4 and current dev.")
-
-
 @td.skip_if_no_mpl
 class TestDataFramePlots(TestPlotBase):
 
@@ -71,12 +61,12 @@ def test_boxplot_legacy2(self):
         # passed ax should be used:
         fig, ax = self.plt.subplots()
         axes = df.boxplot('Col1', by='X', ax=ax)
-        ax_axes = ax.axes if self.mpl_ge_1_5_0 else ax.get_axes()
+        ax_axes = ax.axes
         assert ax_axes is axes
 
         fig, ax = self.plt.subplots()
         axes = df.groupby('Y').boxplot(ax=ax, return_type='axes')
-        ax_axes = ax.axes if self.mpl_ge_1_5_0 else ax.get_axes()
+        ax_axes = ax.axes
         assert ax_axes is axes['A']
 
         # Multiple columns with an ax argument should use same figure
@@ -155,7 +145,6 @@ def _check_ax_limits(col, ax):
 
     @pytest.mark.slow
     def test_boxplot_empty_column(self):
-        _skip_if_mpl_14_or_dev_boxplot()
         df = DataFrame(np.random.randn(20, 4))
         df.loc[:, 0] = np.nan
         _check_plot_works(df.boxplot, return_type='axes')