MPLMPLMPLMPLMPLMPLMPLMPLMPLMPLMPL

Author: h-vetinari

pandas/plotting/_compat.py

@@ -19,6 +19,7 @@ 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,6 +51,7 @@ 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

@@ -403,10 +403,11 @@ def test_get_finder(self):
     def test_finder_daily(self):
         day_lst = [10, 40, 252, 400, 950, 2750, 10000]
 
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
-            # 2.0.0 and >= 3.0.0
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             xpl1 = xpl2 = [Period('1999-1-1', freq='B').ordinal] * len(day_lst)
-        else:
+        else:  # 2.0.1, 2.1.0, 2.2.2, 2.2.3
             xpl1 = [7565, 7564, 7553, 7546, 7518, 7428, 7066]
             xpl2 = [7566, 7564, 7554, 7546, 7519, 7429, 7066]
 
@@ -432,10 +433,11 @@ def test_finder_daily(self):
     def test_finder_quarterly(self):
         yrs = [3.5, 11]
 
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
-            # 2.0.0 and >= 3.0.0
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             xpl1 = xpl2 = [Period('1988Q1').ordinal] * len(yrs)
-        else:
+        else:  # 2.0.1, 2.1.0, 2.2.2, 2.2.3
             xpl1 = [68, 68]
             xpl2 = [72, 68]
 
@@ -461,10 +463,11 @@ def test_finder_quarterly(self):
     def test_finder_monthly(self):
         yrs = [1.15, 2.5, 4, 11]
 
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
-            # 2.0.0 or >= 3.0.0
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             xpl1 = xpl2 = [Period('Jan 1988').ordinal] * len(yrs)
-        else:
+        else:  # 2.0.1, 2.1.0, 2.2.2, 2.2.3
             xpl1 = [216, 216, 204, 204]
             xpl2 = [216, 216, 216, 204]
 
@@ -498,10 +501,11 @@ def test_finder_monthly_long(self):
 
     @pytest.mark.slow
     def test_finder_annual(self):
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
-            # 2.0.0 or >= 3.0.0
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             xp = [1987, 1988, 1990, 1990, 1995, 2020, 2070, 2170]
-        else:
+        else:  # 2.0.1, 2.1.0, 2.2.2, 2.2.3
             xp = [1986, 1986, 1990, 1990, 1995, 2020, 1970, 1970]
 
         xp = [Period(x, freq='A').ordinal for x in xp]
@@ -555,8 +559,10 @@ def test_gaps(self):
         assert len(lines) == 1
         l = lines[0]
         data = l.get_xydata()
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
-            # 2.0.0 or >= 3.0.0
+
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
 
         assert isinstance(data, np.ma.core.MaskedArray)
@@ -574,8 +580,10 @@ def test_gaps(self):
         assert len(lines) == 1
         l = lines[0]
         data = l.get_xydata()
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
-            # 2.0.0 or >= 3.0.0
+
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
 
         assert isinstance(data, np.ma.core.MaskedArray)
@@ -593,8 +601,9 @@ def test_gaps(self):
         assert len(lines) == 1
         l = lines[0]
         data = l.get_xydata()
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
-            # 2.0.0 or >= 3.0.0
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
 
         assert isinstance(data, np.ma.core.MaskedArray)
@@ -616,8 +625,9 @@ 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 or not self.mpl_ge_2_0_1:
-            # 2.0.0 or >= 3.0.0
+        if (self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1
+                or (self.mpl_ge_2_1_0 and not self.mpl_ge_2_2_2)):
+            # 2.0.0, 2.2.0 (exactly) or >= 3.0.0
             data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
 
         assert isinstance(data, np.ma.core.MaskedArray)
@@ -1403,6 +1413,7 @@ def test_format_timedelta_ticks_narrow(self):
 
     def test_format_timedelta_ticks_wide(self):
         expected_labels = [
+            '',
             '00:00:00',
             '1 days 03:46:40',
             '2 days 07:33:20',
@@ -1411,9 +1422,13 @@ def test_format_timedelta_ticks_wide(self):
             '5 days 18:53:20',
             '6 days 22:40:00',
             '8 days 02:26:40',
-            '9 days 06:13:20'
+            '9 days 06:13:20',
+            ''
         ]
-        if not self.mpl_ge_2_0_1:  # 2.0.0
+        if self.mpl_ge_2_2_0:
+            expected_labels = expected_labels[1:-1]
+        elif self.mpl_ge_2_0_1:
+            expected_labels = expected_labels[1:-1]
             expected_labels[-1] = ''
 
         rng = timedelta_range('0', periods=10, freq='1 d')