Remove deprecations in toolkits

QuLogic · QuLogic · commit a5ba87a55235 · 2024-09-24T04:45:37.000-04:00
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -199,31 +199,6 @@ def new_locator(self, nx, ny, nx1=None, ny1=None):
         locator.get_subplotspec = self.get_subplotspec
         return locator
 
-    @_api.deprecated(
-        "3.8", alternative="divider.new_locator(...)(ax, renderer)")
-    def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
-        """
-        Implementation of ``divider.new_locator().__call__``.
-
-        Parameters
-        ----------
-        nx, nx1 : int
-            Integers specifying the column-position of the cell. When *nx1* is
-            None, a single *nx*-th column is specified. Otherwise, the
-            location of columns spanning between *nx* to *nx1* (but excluding
-            *nx1*-th column) is specified.
-        ny, ny1 : int
-            Same as *nx* and *nx1*, but for row positions.
-        axes
-        renderer
-        """
-        xref = self._xrefindex
-        yref = self._yrefindex
-        return self._locate(
-            nx - xref, (nx + 1 if nx1 is None else nx1) - xref,
-            ny - yref, (ny + 1 if ny1 is None else ny1) - yref,
-            axes, renderer)
-
     def _locate(self, nx, ny, nx1, ny1, axes, renderer):
         """
         Implementation of ``divider.new_locator().__call__``.
@@ -305,57 +280,6 @@ def add_auto_adjustable_area(self, use_axes, pad=0.1, adjust_dirs=None):
             self.append_size(d, Size._AxesDecorationsSize(use_axes, d) + pad)
 
 
-@_api.deprecated("3.8")
-class AxesLocator:
-    """
-    A callable object which returns the position and size of a given
-    `.AxesDivider` cell.
-    """
-
-    def __init__(self, axes_divider, nx, ny, nx1=None, ny1=None):
-        """
-        Parameters
-        ----------
-        axes_divider : `~mpl_toolkits.axes_grid1.axes_divider.AxesDivider`
-        nx, nx1 : int
-            Integers specifying the column-position of the
-            cell. When *nx1* is None, a single *nx*-th column is
-            specified. Otherwise, location of columns spanning between *nx*
-            to *nx1* (but excluding *nx1*-th column) is specified.
-        ny, ny1 : int
-            Same as *nx* and *nx1*, but for row positions.
-        """
-        self._axes_divider = axes_divider
-
-        _xrefindex = axes_divider._xrefindex
-        _yrefindex = axes_divider._yrefindex
-
-        self._nx, self._ny = nx - _xrefindex, ny - _yrefindex
-
-        if nx1 is None:
-            nx1 = len(self._axes_divider)
-        if ny1 is None:
-            ny1 = len(self._axes_divider[0])
-
-        self._nx1 = nx1 - _xrefindex
-        self._ny1 = ny1 - _yrefindex
-
-    def __call__(self, axes, renderer):
-
-        _xrefindex = self._axes_divider._xrefindex
-        _yrefindex = self._axes_divider._yrefindex
-
-        return self._axes_divider.locate(self._nx + _xrefindex,
-                                         self._ny + _yrefindex,
-                                         self._nx1 + _xrefindex,
-                                         self._ny1 + _yrefindex,
-                                         axes,
-                                         renderer)
-
-    def get_subplotspec(self):
-        return self._axes_divider.get_subplotspec()
-
-
 class SubplotDivider(Divider):
     """
     The Divider class whose rectangle area is specified as a subplot geometry.
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -20,11 +20,6 @@ def colorbar(self, mappable, **kwargs):
         return self.get_figure(root=False).colorbar(
             mappable, cax=self, location=self.orientation, **kwargs)
 
-    @_api.deprecated("3.8", alternative="ax.tick_params and colorbar.set_label")
-    def toggle_label(self, b):
-        axis = self.axis[self.orientation]
-        axis.toggle(ticklabels=b, label=b)
-
 
 _cbaraxes_class_factory = cbook._make_class_factory(CbarAxesBase, "Cbar{}")
 
diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py
@@ -6,58 +6,13 @@
 from matplotlib.offsetbox import AnchoredOffsetbox
 from matplotlib.patches import Patch, Rectangle
 from matplotlib.path import Path
-from matplotlib.transforms import Bbox, BboxTransformTo
+from matplotlib.transforms import Bbox
 from matplotlib.transforms import IdentityTransform, TransformedBbox
 
 from . import axes_size as Size
 from .parasite_axes import HostAxes
 
 
-@_api.deprecated("3.8", alternative="Axes.inset_axes")
-class InsetPosition:
-    @_docstring.interpd
-    def __init__(self, parent, lbwh):
-        """
-        An object for positioning an inset axes.
-
-        This is created by specifying the normalized coordinates in the axes,
-        instead of the figure.
-
-        Parameters
-        ----------
-        parent : `~matplotlib.axes.Axes`
-            Axes to use for normalizing coordinates.
-
-        lbwh : iterable of four floats
-            The left edge, bottom edge, width, and height of the inset axes, in
-            units of the normalized coordinate of the *parent* axes.
-
-        See Also
-        --------
-        :meth:`matplotlib.axes.Axes.set_axes_locator`
-
-        Examples
-        --------
-        The following bounds the inset axes to a box with 20%% of the parent
-        axes height and 40%% of the width. The size of the axes specified
-        ([0, 0, 1, 1]) ensures that the axes completely fills the bounding box:
-
-        >>> parent_axes = plt.gca()
-        >>> ax_ins = plt.axes([0, 0, 1, 1])
-        >>> ip = InsetPosition(parent_axes, [0.5, 0.1, 0.4, 0.2])
-        >>> ax_ins.set_axes_locator(ip)
-        """
-        self.parent = parent
-        self.lbwh = lbwh
-
-    def __call__(self, ax, renderer):
-        bbox_parent = self.parent.get_position(original=False)
-        trans = BboxTransformTo(bbox_parent)
-        bbox_inset = Bbox.from_bounds(*self.lbwh)
-        bb = TransformedBbox(bbox_inset, trans)
-        return bb
-
-
 class AnchoredLocatorBase(AnchoredOffsetbox):
     def __init__(self, bbox_to_anchor, offsetbox, loc,
                  borderpad=0.5, bbox_transform=None):
diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py
@@ -18,15 +18,14 @@
     host_subplot, make_axes_locatable,
     Grid, AxesGrid, ImageGrid)
 from mpl_toolkits.axes_grid1.anchored_artists import (
-    AnchoredAuxTransformBox, AnchoredDrawingArea, AnchoredEllipse,
+    AnchoredAuxTransformBox, AnchoredDrawingArea,
     AnchoredDirectionArrows, AnchoredSizeBar)
 from mpl_toolkits.axes_grid1.axes_divider import (
     Divider, HBoxDivider, make_axes_area_auto_adjustable, SubplotDivider,
     VBoxDivider)
 from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes
 from mpl_toolkits.axes_grid1.inset_locator import (
-    zoomed_inset_axes, mark_inset, inset_axes, BboxConnectorPatch,
-    InsetPosition)
+    zoomed_inset_axes, mark_inset, inset_axes, BboxConnectorPatch)
 import mpl_toolkits.axes_grid1.mpl_axes
 import pytest
 
diff --git a/lib/mpl_toolkits/axisartist/axes_grid.py b/lib/mpl_toolkits/axisartist/axes_grid.py
diff --git a/lib/mpl_toolkits/axisartist/axes_rgb.py b/lib/mpl_toolkits/axisartist/axes_rgb.py
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -370,10 +370,6 @@ def get_gridlines(self, which="major", axis="both"):
 
 class Axes(maxes.Axes):
 
-    @_api.deprecated("3.8", alternative="ax.axis")
-    def __call__(self, *args, **kwargs):
-        return maxes.Axes.axis(self.axes, *args, **kwargs)
-
     def __init__(self, *args, grid_helper=None, **kwargs):
         self._axisline_on = True
         self._grid_helper = grid_helper if grid_helper else GridHelperRectlinear(self)
diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py
@@ -147,17 +147,6 @@ def __init__(self, aux_trans, extremes,
                          tick_formatter1=tick_formatter1,
                          tick_formatter2=tick_formatter2)
 
-    @_api.deprecated("3.8")
-    def get_data_boundary(self, side):
-        """
-        Return v=0, nth=1.
-        """
-        lon1, lon2, lat1, lat2 = self.grid_finder.extreme_finder(*[None] * 5)
-        return dict(left=(lon1, 0),
-                    right=(lon2, 0),
-                    bottom=(lat1, 1),
-                    top=(lat2, 1))[side]
-
     def new_fixed_axis(
             self, loc, nth_coord=None, axis_direction=None, offset=None, axes=None):
         if axes is None:
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -195,11 +195,6 @@ def set_ticks_position(self, position):
         position : {'lower', 'upper', 'both', 'default', 'none'}
             The position of the bolded axis lines, ticks, and tick labels.
         """
-        if position in ['top', 'bottom']:
-            _api.warn_deprecated('3.8', name=f'{position=}',
-                                 obj_type='argument value',
-                                 alternative="'upper' or 'lower'")
-            return
         _api.check_in_list(['lower', 'upper', 'both', 'default', 'none'],
                            position=position)
         self._tick_position = position
@@ -224,11 +219,6 @@ def set_label_position(self, position):
         position : {'lower', 'upper', 'both', 'default', 'none'}
             The position of the axis label.
         """
-        if position in ['top', 'bottom']:
-            _api.warn_deprecated('3.8', name=f'{position=}',
-                                 obj_type='argument value',
-                                 alternative="'upper' or 'lower'")
-            return
         _api.check_in_list(['lower', 'upper', 'both', 'default', 'none'],
                            position=position)
         self._label_position = position
