Remove more deprecations.

Author: QuLogic

doc/api/axes_api.rst

@@ -587,7 +587,6 @@ non-rectilinear Axes.
    Axes.get_xaxis_transform
    Axes.get_yaxis_transform
    Axes.get_data_ratio
-   Axes.get_data_ratio_log
 
    Axes.get_xaxis_text1_transform
    Axes.get_xaxis_text2_transform

doc/api/next_api_changes/removals/18747-ES.rst

@@ -0,0 +1,18 @@
+``Axes`` methods and properties
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``axes.Axes.get_data_ratio_log``
+- ``axes.SubplotBase.rowNum``; use ``ax.get_subplotspec().rowspan.start``
+  instead
+- ``axes.SubplotBase.colNum``; use ``ax.get_subplotspec().colspan.start``
+  instead
+
+``dates`` functions
+~~~~~~~~~~~~~~~~~~~
+- ``dates.mx2num``
+
+``quiver`` methods
+~~~~~~~~~~~~~~~~~~
+
+- ``quiver.QuiverKey.quiverkey_doc`` has been removed; use
+  ``quiver.QuiverKey.__init__.__doc__`` instead.

doc/missing-references.json

@@ -191,9 +191,6 @@
     "backend_qt5.FigureCanvasQTAgg": [
       "doc/api/prev_api_changes/api_changes_2.2.0.rst:210"
     ],
-    "datetime": [
-      "lib/matplotlib/dates.py:docstring of matplotlib.dates.mx2num:2"
-    ],
     "dateutil.rrule.rrulebase": [
       "<external>/rrule.py:docstring of matplotlib.dates.rrule:1"
     ],

lib/matplotlib/axes/_base.py

@@ -3,7 +3,6 @@
 import inspect
 import itertools
 import logging
-import math
 from numbers import Real
 from operator import attrgetter
 import types
@@ -1602,23 +1601,6 @@ def get_data_ratio(self):
         ysize = max(abs(tymax - tymin), 1e-30)
         return ysize / xsize
 
-    @_api.deprecated("3.2")
-    def get_data_ratio_log(self):
-        """
-        Return the aspect ratio of the raw data in log scale.
-
-        Notes
-        -----
-        Will be used when both axis are in log scale.
-        """
-        xmin, xmax = self.get_xbound()
-        ymin, ymax = self.get_ybound()
-
-        xsize = max(abs(math.log10(xmax) - math.log10(xmin)), 1e-30)
-        ysize = max(abs(math.log10(ymax) - math.log10(ymin)), 1e-30)
-
-        return ysize / xsize
-
     def apply_aspect(self, position=None):
         """
         Adjust the Axes for a specified data aspect ratio.

lib/matplotlib/axes/_subplots.py

@@ -98,16 +98,6 @@ def update_params(self):
         # Now a no-op, as figbox/numRows/numCols are (deprecated) auto-updating
         # properties.
 
-    @_api.deprecated("3.2", alternative="ax.get_subplotspec().rowspan.start")
-    @property
-    def rowNum(self):
-        return self.get_subplotspec().rowspan.start
-
-    @_api.deprecated("3.2", alternative="ax.get_subplotspec().colspan.start")
-    @property
-    def colNum(self):
-        return self.get_subplotspec().colspan.start
-
     @_api.deprecated("3.4", alternative="ax.get_subplotspec().is_first_row()")
     def is_first_row(self):
         return self.get_subplotspec().rowspan.start == 0

lib/matplotlib/dates.py

@@ -166,8 +166,7 @@
 from matplotlib import _api, cbook, ticker, units
 
 __all__ = ('datestr2num', 'date2num', 'num2date', 'num2timedelta', 'drange',
-           'epoch2num', 'num2epoch', 'mx2num', 'set_epoch',
-           'get_epoch', 'DateFormatter',
+           'epoch2num', 'num2epoch', 'set_epoch', 'get_epoch', 'DateFormatter',
            'ConciseDateFormatter', 'IndexDateFormatter', 'AutoDateFormatter',
            'DateLocator', 'RRuleLocator', 'AutoDateLocator', 'YearLocator',
            'MonthLocator', 'WeekdayLocator',
@@ -1783,23 +1782,6 @@ def num2epoch(d):
     return np.asarray(d) * SEC_PER_DAY - dt
 
 
-@_api.deprecated("3.2")
-def mx2num(mxdates):
-    """
-    Convert mx :class:`datetime` instance (or sequence of mx
-    instances) to the new date format.
-    """
-    scalar = False
-    if not np.iterable(mxdates):
-        scalar = True
-        mxdates = [mxdates]
-    ret = epoch2num([m.ticks() for m in mxdates])
-    if scalar:
-        return ret[0]
-    else:
-        return ret
-
-
 def date_ticker_factory(span, tz=None, numticks=5):
     """
     Create a date locator with *numticks* (approx) and a date formatter

lib/matplotlib/pylab.py

@@ -17,7 +17,7 @@
 
 from matplotlib.dates import (
     date2num, num2date, datestr2num, drange, epoch2num,
-    num2epoch, mx2num, DateFormatter, IndexDateFormatter, DateLocator,
+    num2epoch, DateFormatter, IndexDateFormatter, DateLocator,
     RRuleLocator, YearLocator, MonthLocator, WeekdayLocator, DayLocator,
     HourLocator, MinuteLocator, SecondLocator, rrule, MO, TU, WE, TH, FR,
     SA, SU, YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY, SECONDLY,

lib/matplotlib/quiver.py

@@ -374,11 +374,6 @@ def contains(self, mouseevent):
             return True, {}
         return False, {}
 
-    @_api.deprecated("3.2")
-    @property
-    def quiverkey_doc(self):
-        return self.__init__.__doc__
-
 
 def _parse_args(*args, caller_name='function'):
     """

lib/matplotlib/tests/test_axes.py

@@ -5660,15 +5660,6 @@ def test_none_kwargs():
     assert ln.get_linestyle() == '-'
 
 
-def test_ls_ds_conflict():
-    # Passing the drawstyle with the linestyle is deprecated since 3.1.
-    # We still need to test this until it's removed from the code.
-    # But we don't want to see the deprecation warning in the test.
-    with matplotlib._api.suppress_matplotlib_deprecation_warning(), \
-         pytest.raises(ValueError):
-        plt.plot(range(32), linestyle='steps-pre:', drawstyle='steps-post')
-
-
 def test_bar_uint8():
     xs = [0, 1, 2, 3]
     b = plt.bar(np.array(xs, dtype=np.uint8), [2, 3, 4, 5], align="edge")

lib/matplotlib/text.py

@@ -1596,8 +1596,7 @@ def __init__(self, text, xy,
         Parameters
         ----------
         text : str
-            The text of the annotation.  *s* is a deprecated synonym for this
-            parameter.
+            The text of the annotation.
 
         xy : (float, float)
             The point *(x, y)* to annotate. The coordinate system is determined