Bump matplotlib minimum to 2.1.0

Author: h-vetinari

ci/deps/azure-27-locale.yaml

@@ -6,7 +6,7 @@ dependencies:
   - bottleneck=1.2.*
   - cython=0.28.2
   - lxml
-  - matplotlib=2.0.2
+  - matplotlib=2.1.0
   - numpy=1.14.*
   - openpyxl=2.4.0
   - python-dateutil

doc/source/install.rst

@@ -265,7 +265,7 @@ Optional Dependencies
     * `pymysql <https://github.com/PyMySQL/PyMySQL>`__: for MySQL.
     * `SQLite <https://docs.python.org/3/library/sqlite3.html>`__: for SQLite, this is included in Python's standard library by default.
 
-* `matplotlib <http://matplotlib.org/>`__: for plotting, Version 2.0.2 or higher.
+* `matplotlib <http://matplotlib.org/>`__: for plotting, Version 2.1.0 or higher.
 * For Excel I/O:
 
     * `xlrd/xlwt <http://www.python-excel.org/>`__: Excel reading (xlrd), version 1.0.0 or higher required, and writing (xlwt)

doc/source/whatsnew/v0.25.0.rst

@@ -79,7 +79,7 @@ If installed, we now require:
 +-----------------+-----------------+----------+
 | bottleneck      | 1.2.1           |          |
 +-----------------+-----------------+----------+
-| matplotlib      | 2.0.2           |          |
+| matplotlib      | 2.1.0           |          |
 +-----------------+-----------------+----------+
 | numexpr         | 2.6.2           |          |
 +-----------------+-----------------+----------+

environment.yml

@@ -36,7 +36,7 @@ dependencies:
   - ipykernel
   - jinja2
   - lxml
-  - matplotlib>=2.0.2
+  - matplotlib>=2.1.0
   - nbsphinx
   - numexpr>=2.6.8
   - openpyxl

pandas/plotting/_compat.py

@@ -18,8 +18,6 @@ def inner():
     return inner
 
 
-_mpl_eq_2_0_2 = _mpl_version('2.0.2', operator.eq)
-_mpl_ge_2_0_2 = _mpl_version('2.0.2', operator.ge)
 _mpl_ge_2_1_0 = _mpl_version('2.1.0', operator.ge)
 _mpl_eq_2_2_0 = _mpl_version('2.2.0', operator.eq)
 _mpl_ge_2_2_0 = _mpl_version('2.2.0', operator.ge)

pandas/tests/plotting/common.py

@@ -53,8 +53,6 @@ def setup_method(self, method):
         import matplotlib as mpl
         mpl.rcdefaults()
 
-        self.mpl_eq_2_0_2 = plotting._compat._mpl_eq_2_0_2()
-        self.mpl_ge_2_0_2 = plotting._compat._mpl_ge_2_0_2()
         self.mpl_ge_2_1_0 = plotting._compat._mpl_ge_2_1_0()
         self.mpl_eq_2_2_0 = plotting._compat._mpl_eq_2_2_0()
         self.mpl_ge_2_2_0 = plotting._compat._mpl_ge_2_2_0()

pandas/tests/plotting/test_datetimelike.py

@@ -406,8 +406,8 @@ 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 self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_0:
+            # 2.2.0 (exactly) or >= 3.0.0
             xpl1 = xpl2 = [Period('1999-1-1', freq='B').ordinal] * len(day_lst)
         else:  # 2.1.0, 2.2.2, 2.2.3, 2.2.4
             xpl1 = [7565, 7564, 7553, 7546, 7518, 7428, 7066]
@@ -435,8 +435,8 @@ def test_finder_daily(self):
     def test_finder_quarterly(self):
         yrs = [3.5, 11]
 
-        if self.mpl_ge_3_0_0 or self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_0:
+            # 2.2.0 (exactly) or >= 3.0.0
             xpl1 = xpl2 = [Period('1988Q1').ordinal] * len(yrs)
         else:  # 2.1.0, 2.2.2, 2.2.3, 2.2.4
             xpl1 = [68, 68]
@@ -464,8 +464,8 @@ 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 self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_0:
+            # 2.2.0 (exactly) or >= 3.0.0
             xpl1 = xpl2 = [Period('Jan 1988').ordinal] * len(yrs)
         else:  # 2.1.0, 2.2.2, 2.2.3, 2.2.4
             xpl1 = [216, 216, 204, 204]
@@ -501,8 +501,8 @@ def test_finder_monthly_long(self):
 
     @pytest.mark.slow
     def test_finder_annual(self):
-        if self.mpl_ge_3_0_0 or self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_0:
+            # 2.2.0 (exactly) or >= 3.0.0
             xp = [1987, 1988, 1990, 1990, 1995, 2020, 2070, 2170]
         else:  # 2.1.0, 2.2.2, 2.2.3, 2.2.4
             xp = [1986, 1986, 1990, 1990, 1995, 2020, 1970, 1970]
@@ -556,8 +556,8 @@ def test_gaps(self):
         line = lines[0]
         data = line.get_xydata()
 
-        if self.mpl_ge_3_0_0 or self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_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)
@@ -576,8 +576,8 @@ def test_gaps(self):
         line = lines[0]
         data = line.get_xydata()
 
-        if self.mpl_ge_3_0_0 or self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_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)
@@ -595,8 +595,8 @@ def test_gaps(self):
         assert len(lines) == 1
         line = lines[0]
         data = line.get_xydata()
-        if self.mpl_ge_3_0_0 or self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_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)
@@ -619,8 +619,8 @@ def test_gap_upsample(self):
 
         line = lines[0]
         data = line.get_xydata()
-        if self.mpl_ge_3_0_0 or self.mpl_eq_2_0_2 or self.mpl_eq_2_2_0:
-            # 2.0.2, 2.2.0 (exactly) or >= 3.0.0
+        if self.mpl_ge_3_0_0 or self.mpl_eq_2_2_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)
@@ -1415,7 +1415,7 @@ def test_format_timedelta_ticks_wide(self):
         ]
         if self.mpl_ge_2_2_0:
             expected_labels = expected_labels[1:-1]
-        elif self.mpl_ge_2_0_2:
+        elif self.mpl_ge_2_1_0:
             expected_labels = expected_labels[1:-1]
             expected_labels[-1] = ''
 

pandas/tests/plotting/test_series.py

@@ -779,8 +779,7 @@ def test_errorbar_plot(self):
             s.plot(yerr=np.arange(11))
 
         s_err = ['zzz'] * 10
-        exc = TypeError if self.mpl_ge_2_1_0 else ValueError
-        with pytest.raises(exc):
+        with pytest.raises(TypeError):
             s.plot(yerr=s_err)
 
     # This XPASSES when tested with mpl == 3.0.1

requirements-dev.txt

@@ -25,7 +25,7 @@ ipython>=5.6.0
 ipykernel
 jinja2
 lxml
-matplotlib>=2.0.2
+matplotlib>=2.1.0
 nbsphinx
 numexpr>=2.6.8
 openpyxl