Cleanup/update deprecations.

anntzer · anntzer · commit 66d47728bba0 · 2020-03-21T19:28:07.000+01:00
- Fix messed up rebased in deprecations.rst.
- Fix version numbers in bezier.py deprecations (the PR missed 3.2 and
  only went in in 3.3).
diff --git a/doc/api/next_api_changes/deprecations.rst b/doc/api/next_api_changes/deprecations.rst
@@ -227,19 +227,9 @@ The following validators, defined in `.rcsetup`, are deprecated:
 ``validate_axes_titlelocation``, ``validate_toolbar``,
 ``validate_ps_papersize``, ``validate_legend_loc``,
 ``validate_bool_maybe_none``, ``validate_hinting``,
-``validate_movie_writers``.
+``validate_movie_writers``, ``validate_webagg_address``.
 To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
 RcParams(); rc[k] = v`` raises an exception.
-||||||| constructed merge base
-``validate_ps_papersize``, ``validate_legend_log``.  To test whether an rcParam
-value would be acceptable, one can test e.g. ``rc = RcParams(); rc[k] = v``
-raises an exception.
-=======
-``validate_ps_papersize``, ``validate_legend_loc``,
-``validate_webagg_address``.
-To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
-RcParams(); rc[k] = v`` raises an exception.
->>>>>>> Deprecate validate_webagg_address.
 
 Stricter rcParam validation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py
@@ -481,7 +481,7 @@ def make_wedged_bezier2(bezier2, width, w1=1., wm=0.5, w2=0.):
 
 
 @cbook.deprecated(
-    "3.2", alternative="Path.cleaned() and remove the final STOP if needed")
+    "3.3", alternative="Path.cleaned() and remove the final STOP if needed")
 def make_path_regular(p):
     """
     If the ``codes`` attribute of `.Path` *p* is None, return a copy of *p*
@@ -497,7 +497,7 @@ def make_path_regular(p):
         return p
 
 
-@cbook.deprecated("3.2", alternative="Path.make_compound_path()")
+@cbook.deprecated("3.3", alternative="Path.make_compound_path()")
 def concatenate_paths(paths):
     """Concatenate a list of paths into a single path."""
     vertices = np.concatenate([p.vertices for p in paths])
