Refinements

Author: rhshadrach

pandas/errors/__init__.py

@@ -98,7 +98,10 @@ class PandasChangeWarning(Warning):
 
     See Also
     --------
-    errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
+    errors.PandasPendingDeprecationWarning : Class for deprecations that will raise a
+        PendingDeprecationWarning.
+    errors.PandasDeprecationWarning : Class for deprecations that will raise a
+        DeprecationWarning.
     errors.PandasFutureWarning : Class for deprecations that will raise a FutureWarning.
 
     Examples
@@ -119,7 +122,9 @@ class PandasPendingDeprecationWarning(PandasChangeWarning, PendingDeprecationWar
 
     See Also
     --------
-    errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
+    errors.PandasChangeWarning: Class for deprecations that will raise any warning.
+    errors.PandasDeprecationWarning : Class for deprecations that will raise a
+        DeprecationWarning.
     errors.PandasFutureWarning : Class for deprecations that will raise a FutureWarning.
 
     Examples
@@ -135,7 +140,9 @@ class PandasDeprecationWarning(PandasChangeWarning, DeprecationWarning):
 
     See Also
     --------
-    errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
+    errors.PandasChangeWarning: Class for deprecations that will raise any warning.
+    errors.PandasPendingDeprecationWarning : Class for deprecations that will raise a
+        PendingDeprecationWarning.
     errors.PandasFutureWarning : Class for deprecations that will raise a FutureWarning.
 
     Examples
@@ -151,7 +158,11 @@ class PandasFutureWarning(PandasChangeWarning, FutureWarning):
 
     See Also
     --------
-    errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
+    errors.PandasChangeWarning: Class for deprecations that will raise any warning.
+    errors.PandasPendingDeprecationWarning : Class for deprecations that will raise a
+        PendingDeprecationWarning.
+    errors.PandasDeprecationWarning : Class for deprecations that will raise a
+        DeprecationWarning.
 
     Examples
     --------
@@ -166,6 +177,11 @@ class Pandas4Warning(PandasDeprecationWarning):
 
     See Also
     --------
+    errors.PandasChangeWarning: Class for deprecations that will raise any warning.
+    errors.PandasPendingDeprecationWarning : Class for deprecations that will raise a
+        PendingDeprecationWarning.
+    errors.PandasDeprecationWarning : Class for deprecations that will raise a
+        DeprecationWarning.
     errors.PandasFutureWarning : Class for deprecations that will raise a FutureWarning.
 
     Examples
@@ -186,7 +202,11 @@ class Pandas5Warning(PandasPendingDeprecationWarning):
 
     See Also
     --------
-    errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
+    errors.PandasChangeWarning: Class for deprecations that will raise any warning.
+    errors.PandasPendingDeprecationWarning : Class for deprecations that will raise a
+        PendingDeprecationWarning.
+    errors.PandasDeprecationWarning : Class for deprecations that will raise a
+        DeprecationWarning.
     errors.PandasFutureWarning : Class for deprecations that will raise a FutureWarning.
 
     Examples

pandas/tests/test_errors.py

@@ -112,6 +112,21 @@ def test_AbstractMethodError_classmethod():
         Foo().method()
 
 
+@pytest.mark.parametrize(
+    "warn_category, catch_category",
+    [
+        (Pandas4Warning, PandasChangeWarning),
+        (Pandas4Warning, PandasDeprecationWarning),
+        (Pandas5Warning, PandasChangeWarning),
+        (Pandas5Warning, PandasPendingDeprecationWarning),
+    ],
+)
+def test_pandas_warnings(warn_category, catch_category):
+    # https://github.com/pandas-dev/pandas/pull/61468
+    with tm.assert_produces_warning(catch_category):
+        warnings.warn("test", category=warn_category)
+
+
 @pytest.mark.parametrize(
     "warn_category, filter_category",
     [

pandas/tests/util/test_deprecate_nonkeyword_arguments.py

@@ -55,8 +55,8 @@ def test_four_arguments():
 
 def test_three_arguments_with_name_in_warning():
     msg = (
-        "Starting with pandas version 4.0 all arguments of f_add_inputs "
-        "except for the arguments 'a' and 'b' will be keyword-only."
+        f"Starting with pandas version {WARNING_CATEGORY.version()} all arguments of "
+        "f_add_inputs except for the arguments 'a' and 'b' will be keyword-only."
     )
     with tm.assert_produces_warning(WARNING_CATEGORY, match=msg):
         assert f(6, 3, 3) == 12
@@ -84,7 +84,7 @@ def test_three_arguments_default_allowed_args():
 
 def test_three_positional_argument_with_warning_message_analysis():
     msg = (
-        "Starting with pandas version 4.0 all arguments of g "
+        f"Starting with pandas version {WARNING_CATEGORY.version()} all arguments of g "
         "except for the argument 'a' will be keyword-only."
     )
     with tm.assert_produces_warning(WARNING_CATEGORY, match=msg):
@@ -111,7 +111,10 @@ def test_one_positional_argument():
 
 
 def test_one_positional_argument_with_warning_message_analysis():
-    msg = "Starting with pandas version 4.0 all arguments of h will be keyword-only."
+    msg = (
+        f"Starting with pandas version {WARNING_CATEGORY.version()} all arguments "
+        "of h will be keyword-only."
+    )
     with tm.assert_produces_warning(WARNING_CATEGORY, match=msg):
         assert h(19) == 19
 
@@ -141,8 +144,8 @@ def test_foo_signature():
 
 def test_class():
     msg = (
-        r"Starting with pandas version 4.0 all arguments of Foo\.baz "
-        r"except for the argument \'bar\' will be keyword-only"
+        rf"Starting with pandas version {WARNING_CATEGORY.version()} all arguments "
+        r"of Foo\.baz except for the argument \'bar\' will be keyword-only"
     )
     with tm.assert_produces_warning(WARNING_CATEGORY, match=msg):
         Foo().baz("qux", "quox")