MNT: de-jargon hard-coded warning and deprecation decorator

Author: tacaswell

lib/matplotlib/_api/deprecation.py

@@ -29,14 +29,17 @@ def _generate_deprecation_warning(
             raise ValueError(
                 "A pending deprecation cannot have a scheduled removal")
     else:
-        removal = f"in {removal}" if removal else "two meso releases later"
+        if not removal:
+            macro, meso, *_ = since.split('.')
+            removal = f'{macro}.{int(meso) + 2}'
+        removal = f"in {removal}"
     if not message:
         message = (
             ("The %(name)s %(obj_type)s" if obj_type else "%(name)s")
             + (" will be deprecated in a future version"
                if pending else
-               (" was deprecated in Matplotlib %(since)s"
-                + (" and will be removed %(removal)s" if removal else "")))
+               " was deprecated in Matplotlib %(since)s and will be removed %(removal)s"
+               )
             + "."
             + (" Use %(alternative)s instead." if alternative else "")
             + (" %(addendum)s" if addendum else ""))

lib/matplotlib/tests/test_pyplot.py

@@ -43,8 +43,8 @@ def test_pyplot_up_to_date(tmp_path):
 
 
 def test_copy_docstring_and_deprecators(recwarn):
-    @mpl._api.rename_parameter("(version)", "old", "new")
-    @mpl._api.make_keyword_only("(version)", "kwo")
+    @mpl._api.rename_parameter(mpl.__version__, "old", "new")
+    @mpl._api.make_keyword_only(mpl.__version__, "kwo")
     def func(new, kwo=None):
         pass
 

src/ft2font_wrapper.cpp

@@ -75,8 +75,8 @@ static PyObject *PyFT2Image_draw_rect(PyFT2Image *self, PyObject *args)
 {
     char const* msg =
         "FT2Image.draw_rect is deprecated since Matplotlib 3.8 and will be removed "
-        "two meso releases later as it is not used in the library. If you rely on "
-        "it, please let us know.";
+        "in Matplotlib 3.10 releases later as it is not used in the library. "
+        "If you rely on it, please let us know.";
     if (PyErr_WarnEx(PyExc_DeprecationWarning, msg, 1)) {
         return NULL;
     }