Remove deprecated parameters.

Author: QuLogic

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

@@ -6,6 +6,15 @@
   instead
 - ``axes.SubplotBase.colNum``; use ``ax.get_subplotspec().colspan.start``
   instead
+- the *verts* parameter to ``scatter`` (use *marker* instead)
+- Passing more than one positional argument to `~matplotlib.axes.Axes.axis`
+  will now raise an error.
+- Passing ``"range"`` to the *whis* parameter of `.Axes.boxplot` and
+  `.cbook.boxplot_stats` to mean "the whole data range" is  no longer
+  supported.
+- Passing scalars to parameter *where* in `.axes.Axes.fill_between` and
+  `.axes.Axes.fill_betweenx` is no longer accepted and non-matching sizes now
+  raise a `ValueError`.
 
 ``dates`` functions
 ~~~~~~~~~~~~~~~~~~~
@@ -25,3 +34,19 @@ deleted, and the following methods are removed:
 
 - ``Axis.set_smart_bounds`` and ``Axis.get_smart_bounds``
 - ``Spine.set_smart_bounds`` and ``Spine.get_smart_bounds``
+
+Testing
+~~~~~~~
+The *switch_backend_warn* parameter to ``matplotlib.test`` has no effect and
+has been removed.
+
+``tight_layout()``
+~~~~~~~~~~~~~~~~~~
+The *renderer* parameter to `.Figure.tight_layout` has been removed; this
+method now always uses the renderer instance cached on the `.Figure`.
+
+``axes_grid1``
+~~~~~~~~~~~~~~
+- The *locator* parameter to ``colorbar()`` has been removed in favor of its
+  synonym *ticks* (which already existed previously, and is consistent with
+  :mod:`matplotlib.colorbar`).

doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst

@@ -142,6 +142,11 @@ Passing scalars to parameter *where* in ``fill_between()`` and
 broadcasted to the size of *x*. Non-matching sizes will raise a ``ValueError``
 in the future.
 
+``scatter()``
+~~~~~~~~~~~~~
+Passing the *verts* parameter to `.axes.Axes.scatter` is deprecated; use the
+*marker* parameter instead.
+
 ``tight_layout()``
 ~~~~~~~~~~~~~~~~~~
 The ``renderer`` parameter to `.Figure.tight_layout` is deprecated; this method
@@ -255,8 +260,8 @@ both 1) matplotlib's conftests have not been called and 2) nose is in
 During the deprecation period, to force the generation of nose base tests,
 import nose first.
 
-The ``switch_backend_warn`` parameter to ``matplotlib.test`` has no effect and
-is deprecated.
+The *switch_backend_warn* parameter to ``matplotlib.test`` has no effect and is
+deprecated.
 
 ``testing.jpl_units.UnitDbl.UnitDbl.checkUnits`` is deprecated.
 

doc/api/prev_api_changes/api_changes_3.2.0/removals.rst

@@ -57,8 +57,7 @@ The following API elements have been removed:
   instead)
 - ``axisartist.axes_divider.Axes``, ``axisartist.axes_divider.LocatableAxes``
   (use ``axisartist.axislines.Axes`` instead)
-- the ``normed`` kwarg to ``hist`` (use ``density`` instead)
-- the ``verts`` parameter to ``scatter`` (use ``marker`` instead)
+- the *normed* keyword argument to ``hist`` (use *density* instead)
 - passing ``(verts, 0)`` or ``(..., 3)`` when specifying a marker to specify a
   path or a circle, respectively (instead, use ``verts`` or ``"o"``,
   respectively)

lib/matplotlib/__init__.py

@@ -1193,10 +1193,8 @@ def _init_tests():
                 "" if ft2font.__freetype_build_type__ == 'local' else "not "))
 
 
-@cbook._delete_parameter("3.2", "switch_backend_warn")
 @cbook._delete_parameter("3.3", "recursionlimit")
-def test(verbosity=None, coverage=False, switch_backend_warn=True,
-         recursionlimit=0, **kwargs):
+def test(verbosity=None, coverage=False, *, recursionlimit=0, **kwargs):
     """Run the matplotlib test suite."""
 
     try:

lib/matplotlib/axes/_axes.py

@@ -3472,7 +3472,6 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
             If a pair of floats, they indicate the percentiles at which to
             draw the whiskers (e.g., (5, 95)).  In particular, setting this to
             (0, 100) results in whiskers covering the whole range of the data.
-            "range" is a deprecated synonym for (0, 100).
 
             In the edge case where ``Q1 == Q3``, *whis* is automatically set
             to (0, 100) (cover the whole range of the data) if *autorange* is
@@ -4224,11 +4223,9 @@ def invalid_shape_exception(csize, xsize):
                                      "edgecolors", "c", "facecolor",
                                      "facecolors", "color"],
                       label_namer="y")
-    @cbook._delete_parameter("3.2", "verts")
     def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
-                vmin=None, vmax=None, alpha=None, linewidths=None,
-                verts=None, edgecolors=None, *, plotnonfinite=False,
-                **kwargs):
+                vmin=None, vmax=None, alpha=None, linewidths=None, *,
+                edgecolors=None, plotnonfinite=False, **kwargs):
         """
         A scatter plot of *y* vs. *x* with varying marker size and/or color.
 
@@ -5097,7 +5094,6 @@ def _fill_between_x_or_y(
         """
 
         dep_dir = {"x": "y", "y": "x"}[ind_dir]
-        func_name = {"x": "fill_between", "y": "fill_betweenx"}[dep_dir]
 
         if not rcParams["_internal.classic_mode"]:
             kwargs = cbook.normalize_kwargs(kwargs, mcoll.Collection)
@@ -5120,10 +5116,8 @@ def _fill_between_x_or_y(
         else:
             where = np.asarray(where, dtype=bool)
             if where.size != ind.size:
-                cbook.warn_deprecated(
-                    "3.2", message=f"Since %(since)s, the parameter *where* "
-                    f"must have the same size as {ind} in {func_name}(). This "
-                    "will become an error %(removal)s.")
+                raise ValueError(f"where size ({where.size}) does not match "
+                                 f"{ind_dir} size ({ind.size})")
         where = where & ~functools.reduce(
             np.logical_or, map(np.ma.getmask, [ind, dep1, dep2]))
 

lib/matplotlib/axes/_base.py

@@ -1781,7 +1781,10 @@ def axis(self, *args, emit=True, **kwargs):
         matplotlib.axes.Axes.set_xlim
         matplotlib.axes.Axes.set_ylim
         """
-        if len(args) == 1 and isinstance(args[0], (str, bool)):
+        if len(args) > 1:
+            raise TypeError("axis() takes 0 or 1 positional arguments but "
+                            f"{len(args)} were given")
+        elif len(args) == 1 and isinstance(args[0], (str, bool)):
             s = args[0]
             if s is True:
                 s = 'on'
@@ -1823,12 +1826,7 @@ def axis(self, *args, emit=True, **kwargs):
                 raise ValueError('Unrecognized string %s to axis; '
                                  'try on or off' % s)
         else:
-            if len(args) >= 1:
-                if len(args) != 1:
-                    cbook.warn_deprecated(
-                        "3.2", message="Passing more than one positional "
-                        "argument to axis() is deprecated and will raise a "
-                        "TypeError %(removal)s.")
+            if len(args) == 1:
                 limits = args[0]
                 try:
                     xmin, xmax, ymin, ymax = limits

lib/matplotlib/cbook/__init__.py

@@ -1055,8 +1055,7 @@ def boxplot_stats(X, whis=1.5, bootstrap=None, labels=None,
 
         If a pair of floats, they indicate the percentiles at which to draw the
         whiskers (e.g., (5, 95)).  In particular, setting this to (0, 100)
-        results in whiskers covering the whole range of the data.  "range" is
-        a deprecated synonym for (0, 100).
+        results in whiskers covering the whole range of the data.
 
         In the edge case where ``Q1 == Q3``, *whis* is automatically set to
         (0, 100) (cover the whole range of the data) if *autorange* is True.
@@ -1199,22 +1198,13 @@ def _compute_conf_interval(data, med, iqr, bootstrap):
         )
 
         # lowest/highest non-outliers
-        if np.isscalar(whis):
-            if np.isreal(whis):
-                loval = q1 - whis * stats['iqr']
-                hival = q3 + whis * stats['iqr']
-            elif whis in ['range', 'limit', 'limits', 'min/max']:
-                warn_deprecated(
-                    "3.2", message=f"Setting whis to {whis!r} is deprecated "
-                    "since %(since)s and support for it will be removed "
-                    "%(removal)s; set it to [0, 100] to achieve the same "
-                    "effect.")
-                loval = np.min(x)
-                hival = np.max(x)
-            else:
-                raise ValueError('whis must be a float or list of percentiles')
-        else:
+        if np.iterable(whis) and not isinstance(whis, str):
             loval, hival = np.percentile(x, whis)
+        elif np.isreal(whis):
+            loval = q1 - whis * stats['iqr']
+            hival = q3 + whis * stats['iqr']
+        else:
+            raise ValueError('whis must be a float or list of percentiles')
 
         # get high extreme
         wiskhi = x[x <= hival]

lib/matplotlib/figure.py

@@ -3211,9 +3211,7 @@ def execute_constrained_layout(self, renderer=None):
             renderer = get_renderer(fig)
         do_constrained_layout(fig, renderer, h_pad, w_pad, hspace, wspace)
 
-    @cbook._delete_parameter("3.2", "renderer")
-    def tight_layout(self, renderer=None, pad=1.08, h_pad=None, w_pad=None,
-                     rect=None):
+    def tight_layout(self, *, pad=1.08, h_pad=None, w_pad=None, rect=None):
         """
         Adjust the padding between and around subplots.
 
@@ -3223,8 +3221,6 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None, w_pad=None,
 
         Parameters
         ----------
-        renderer : subclass of `~.backend_bases.RendererBase`, optional
-            Defaults to the renderer for the figure.  Deprecated.
         pad : float, default: 1.08
             Padding between the figure edge and the edges of subplots,
             as a fraction of the font size.
@@ -3250,8 +3246,7 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None, w_pad=None,
                                  "compatible with tight_layout, so results "
                                  "might be incorrect.")
 
-        if renderer is None:
-            renderer = get_renderer(self)
+        renderer = get_renderer(self)
         ctx = (renderer._draw_disabled()
                if hasattr(renderer, '_draw_disabled')
                else suppress())

lib/matplotlib/pyplot.py

@@ -2983,14 +2983,12 @@ def quiverkey(Q, X, Y, U, label, **kw):
 @_copy_docstring_and_deprecators(Axes.scatter)
 def scatter(
         x, y, s=None, c=None, marker=None, cmap=None, norm=None,
-        vmin=None, vmax=None, alpha=None, linewidths=None,
-        verts=_api.deprecation._deprecated_parameter, edgecolors=None,
-        *, plotnonfinite=False, data=None, **kwargs):
+        vmin=None, vmax=None, alpha=None, linewidths=None, *,
+        edgecolors=None, plotnonfinite=False, data=None, **kwargs):
     __ret = gca().scatter(
         x, y, s=s, c=c, marker=marker, cmap=cmap, norm=norm,
         vmin=vmin, vmax=vmax, alpha=alpha, linewidths=linewidths,
-        verts=verts, edgecolors=edgecolors,
-        plotnonfinite=plotnonfinite,
+        edgecolors=edgecolors, plotnonfinite=plotnonfinite,
         **({"data": data} if data is not None else {}), **kwargs)
     sci(__ret)
     return __ret

lib/mpl_toolkits/axes_grid1/axes_grid.py

@@ -25,7 +25,6 @@ def __init__(self, *args, orientation, **kwargs):
         self._locator = None  # deprecated.
         super().__init__(*args, **kwargs)
 
-    @cbook._rename_parameter("3.2", "locator", "ticks")
     def colorbar(self, mappable, *, ticks=None, **kwargs):
 
         if self.orientation in ["top", "bottom"]: