Last round of mpl debugging

Author: h-vetinari

pandas/plotting/_compat.py

@@ -19,7 +19,6 @@ def inner():
 
 
 _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)
 _mpl_ge_2_2_2 = _mpl_version('2.2.2', operator.ge)
 _mpl_ge_3_0_0 = _mpl_version('3.0.0', operator.ge)

pandas/tests/plotting/common.py

@@ -51,7 +51,6 @@ def setup_method(self, method):
         mpl.rcdefaults()
 
         self.mpl_ge_2_0_1 = plotting._compat._mpl_ge_2_0_1()
-        self.mpl_ge_2_1_0 = plotting._compat._mpl_ge_2_1_0()
         self.mpl_ge_2_2_0 = plotting._compat._mpl_ge_2_2_0()
         self.mpl_ge_2_2_2 = plotting._compat._mpl_ge_2_2_2()
         self.mpl_ge_3_0_0 = plotting._compat._mpl_ge_3_0_0()

pandas/tests/plotting/test_datetimelike.py

@@ -554,7 +554,7 @@ def test_finder_hourly(self):
         ser.plot(ax=ax)
         xaxis = ax.get_xaxis()
         rs = xaxis.get_majorticklocs()[0]
-        if self.mpl_ge_2_1_0:
+        if self.mpl_ge_2_0_1:
             xp = Period('1999-01-01 00:00', freq='H').ordinal
         else:
             xp = Period('1998-12-31 22:00', freq='H').ordinal
@@ -572,7 +572,8 @@ def test_gaps(self):
         assert len(lines) == 1
         l = lines[0]
         data = l.get_xydata()
-        if self.mpl_ge_3_0_0:
+        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
+            # 2.0.0 or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
         if not isinstance(data, np.ma.core.MaskedArray):
             print(matplotlib.__version__, np.__version__, type(data))
@@ -591,7 +592,8 @@ def test_gaps(self):
         assert len(lines) == 1
         l = lines[0]
         data = l.get_xydata()
-        if self.mpl_ge_3_0_0:
+        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
+            # 2.0.0 or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
         if not isinstance(data, np.ma.core.MaskedArray):
             print(matplotlib.__version__, np.__version__, type(data))
@@ -610,7 +612,8 @@ def test_gaps(self):
         assert len(lines) == 1
         l = lines[0]
         data = l.get_xydata()
-        if self.mpl_ge_3_0_0:
+        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
+            # 2.0.0 or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
         if not isinstance(data, np.ma.core.MaskedArray):
             print(matplotlib.__version__, np.__version__, type(data))
@@ -634,7 +637,8 @@ def test_gap_upsample(self):
         assert len(ax.right_ax.get_lines()) == 1
         l = lines[0]
         data = l.get_xydata()
-        if self.mpl_ge_3_0_0:
+        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
+            # 2.0.0 or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
 
         if not isinstance(data, np.ma.core.MaskedArray):