use pendingdeprecationwarning instead. Narrow some filterwarnings. Fix more tests

Author: jakkdl

src/_pytest/deprecated.py

@@ -16,6 +16,7 @@
 from warnings import warn
 
 from _pytest.warning_types import PytestDeprecationWarning
+from _pytest.warning_types import PytestPendingDeprecationWarning
 from _pytest.warning_types import PytestRemovedIn9Warning
 from _pytest.warning_types import UnformattedWarning
 
@@ -35,18 +36,24 @@ def decorator(func: object) -> object:
         return decorator
 
 
-CALLABLE_RAISES = PytestDeprecationWarning(
-    "The callable form of pytest.raises is deprecated.\n"
-    "Use `with pytest.raises(...):` instead."
+CALLABLE_RAISES = PytestPendingDeprecationWarning(
+    "The callable form of pytest.raises will be deprecated in a future version.\n"
+    "Use `with pytest.raises(...):` instead.\n"
+    "Full deprecation will not be made until there's a tool to automatically update"
+    " code to use the context-manager form"
 )
 
-CALLABLE_WARNS = PytestDeprecationWarning(
-    "The callable form of pytest.warns is deprecated.\n"
+CALLABLE_WARNS = PytestPendingDeprecationWarning(
+    "The callable form of pytest.warns will be deprecated in a future version.\n"
     "Use `with pytest.warns(...):` instead."
+    "Full deprecation will not be made until there's a tool to automatically update"
+    " code to use the context-manager form"
 )
-CALLABLE_DEPRECATED_CALL = PytestDeprecationWarning(
-    "The callable form of pytest.deprecated_call is deprecated.\n"
+CALLABLE_DEPRECATED_CALL = PytestPendingDeprecationWarning(
+    "The callable form of pytest.deprecated_call will be deprecated in a future version.\n"
     "Use `with pytest.deprecated_call():` instead."
+    "Full deprecation will not be made until there's a tool to automatically update"
+    " code to use the context-manager form"
 )
 
 

src/_pytest/python_api.py

@@ -957,7 +957,7 @@ def raises(
         >>> raises(ZeroDivisionError, f, x=0)
         <ExceptionInfo ...>
 
-    The form above is fully supported but discouraged for new code because the
+    The form above is going to be deprecated in a future pytest release as the
     context manager form is regarded as more readable and less error-prone.
 
     .. note::

src/_pytest/warning_types.py

@@ -44,6 +44,12 @@ class PytestCollectionWarning(PytestWarning):
     __module__ = "pytest"
 
 
+class PytestPendingDeprecationWarning(PytestWarning, PendingDeprecationWarning):
+    """Warning emitted for features that will be deprecated in a future version."""
+
+    __module__ = "pytest"
+
+
 class PytestDeprecationWarning(PytestWarning, DeprecationWarning):
     """Warning class for features that will be removed in a future version."""
 

src/pytest/__init__.py

@@ -81,6 +81,7 @@
 from _pytest.warning_types import PytestDeprecationWarning
 from _pytest.warning_types import PytestExperimentalApiWarning
 from _pytest.warning_types import PytestFDWarning
+from _pytest.warning_types import PytestPendingDeprecationWarning
 from _pytest.warning_types import PytestRemovedIn9Warning
 from _pytest.warning_types import PytestUnhandledThreadExceptionWarning
 from _pytest.warning_types import PytestUnknownMarkWarning
@@ -130,6 +131,7 @@
     "PytestDeprecationWarning",
     "PytestExperimentalApiWarning",
     "PytestFDWarning",
+    "PytestPendingDeprecationWarning",
     "PytestPluginManager",
     "PytestRemovedIn9Warning",
     "PytestUnhandledThreadExceptionWarning",

testing/python/raises.py

@@ -225,10 +225,10 @@ def __call__(self):
         refcount = len(gc.get_referrers(t))
 
         if method == "function":
-            with pytest.warns(pytest.PytestDeprecationWarning):
+            with pytest.warns(pytest.PytestPendingDeprecationWarning):
                 pytest.raises(ValueError, t)
         elif method == "function_match":
-            with pytest.warns(pytest.PytestDeprecationWarning):
+            with pytest.warns(pytest.PytestPendingDeprecationWarning):
                 pytest.raises(ValueError, t).match("^$")
         elif method == "with":
             with pytest.raises(ValueError):
@@ -267,22 +267,22 @@ def test_raises_match(self) -> None:
                 int("asdf", base=10)
 
         # "match" without context manager.
-        with pytest.warns(pytest.PytestDeprecationWarning):
+        with pytest.warns(pytest.PytestPendingDeprecationWarning):
             pytest.raises(ValueError, int, "asdf").match("invalid literal")
         with pytest.raises(AssertionError) as excinfo:
-            with pytest.warns(pytest.PytestDeprecationWarning):
+            with pytest.warns(pytest.PytestPendingDeprecationWarning):
                 pytest.raises(ValueError, int, "asdf").match(msg)
         assert str(excinfo.value) == expr
 
-        with pytest.warns(pytest.PytestDeprecationWarning):
+        with pytest.warns(pytest.PytestPendingDeprecationWarning):
             pytest.raises(TypeError, int, match="invalid")  # type: ignore[call-overload]
 
         def tfunc(match):
             raise ValueError(f"match={match}")
 
-        with pytest.warns(pytest.PytestDeprecationWarning):
+        with pytest.warns(pytest.PytestPendingDeprecationWarning):
             pytest.raises(ValueError, tfunc, match="asdf").match("match=asdf")
-        with pytest.warns(pytest.PytestDeprecationWarning):
+        with pytest.warns(pytest.PytestPendingDeprecationWarning):
             pytest.raises(ValueError, tfunc, match="").match("match=")
 
         # empty string matches everything, which is probably not what the user wants
@@ -411,5 +411,5 @@ def test_callable_func_kwarg(self) -> None:
         def my_raise() -> None:
             raise ValueError
 
-        with pytest.warns(pytest.PytestDeprecationWarning):
+        with pytest.warns(pytest.PytestPendingDeprecationWarning):
             pytest.raises(expected_exception=ValueError, func=my_raise)

testing/test_cacheprovider.py

@@ -51,7 +51,8 @@ def test_config_cache_dataerror(self, pytester: Pytester) -> None:
         config = pytester.parseconfigure()
         assert config.cache is not None
         cache = config.cache
-        pytest.raises(TypeError, lambda: cache.set("key/name", cache))
+        with pytest.raises(TypeError):
+            cache.set("key/name", cache)
         config.cache.set("key/name", 0)
         config.cache._getvaluepath("key/name").write_bytes(b"123invalid")
         val = config.cache.get("key/name", -2)
@@ -143,7 +144,8 @@ def test_cachefuncarg(cache):
                 val = cache.get("some/thing", None)
                 assert val is None
                 cache.set("some/thing", [1])
-                pytest.raises(TypeError, lambda: cache.get("some/thing"))
+                with pytest.raises(TypeError):
+                    cache.get("some/thing")
                 val = cache.get("some/thing", [])
                 assert val == [1]
         """

testing/test_recwarn.py

@@ -5,7 +5,7 @@
 import sys
 import warnings
 
-from _pytest.warning_types import PytestDeprecationWarning
+from _pytest.warning_types import PytestPendingDeprecationWarning
 import pytest
 from pytest import ExitCode
 from pytest import Pytester
@@ -161,7 +161,7 @@ def test_deprecated_call(self) -> None:
 
     def test_deprecated_call_ret(self) -> None:
         with pytest.warns(
-            PytestDeprecationWarning,
+            PytestPendingDeprecationWarning,
             match=(
                 wrap_escape(
                     "The callable form of pytest.deprecated_call is deprecated.\n"
@@ -212,7 +212,7 @@ def f():
         msg = "No warnings of type (.*DeprecationWarning.*, .*PendingDeprecationWarning.*)"
         with pytest.raises(pytest.fail.Exception, match=msg):
             if mode == "call":
-                with pytest.warns(PytestDeprecationWarning):
+                with pytest.warns(PytestPendingDeprecationWarning):
                     pytest.deprecated_call(f)
             else:
                 with pytest.deprecated_call():
@@ -223,7 +223,7 @@ def f():
     )
     @pytest.mark.parametrize("mode", ["context_manager", "call"])
     @pytest.mark.parametrize("call_f_first", [True, False])
-    @pytest.mark.filterwarnings("ignore")
+    @pytest.mark.filterwarnings("ignore:hi")
     def test_deprecated_call_modes(self, warning_type, mode, call_f_first) -> None:
         """Ensure deprecated_call() captures a deprecation warning as expected inside its
         block/function.
@@ -237,7 +237,8 @@ def f():
         if call_f_first:
             assert f() == 10
         if mode == "call":
-            assert pytest.deprecated_call(f) == 10
+            with pytest.warns(PytestPendingDeprecationWarning):
+                assert pytest.deprecated_call(f) == 10
         else:
             with pytest.deprecated_call():
                 assert f() == 10
@@ -258,7 +259,7 @@ def f():
 
             with pytest.warns(warning):
                 with pytest.raises(pytest.fail.Exception):
-                    with pytest.warns(PytestDeprecationWarning):
+                    with pytest.warns(PytestPendingDeprecationWarning):
                         pytest.deprecated_call(f)
                 with pytest.raises(pytest.fail.Exception):
                     with pytest.deprecated_call():
@@ -293,7 +294,7 @@ def test_several_messages(self) -> None:
 
     def test_function(self) -> None:
         with pytest.warns(
-            PytestDeprecationWarning,
+            PytestPendingDeprecationWarning,
             match=(
                 wrap_escape(
                     "The callable form of pytest.warns is deprecated.\n"
@@ -452,16 +453,17 @@ def test_none_of_multiple_warns(self) -> None:
                     warnings.warn("bbbbbbbbbb", UserWarning)
                     warnings.warn("cccccccccc", UserWarning)
 
-    @pytest.mark.filterwarnings("ignore")
+    @pytest.mark.filterwarnings("ignore:ohai")
     def test_can_capture_previously_warned(self) -> None:
         def f() -> int:
             warnings.warn(UserWarning("ohai"))
             return 10
 
         assert f() == 10
-        assert pytest.warns(UserWarning, f) == 10
-        assert pytest.warns(UserWarning, f) == 10
-        assert pytest.warns(UserWarning, f) != "10"  # type: ignore[comparison-overlap]
+        with pytest.warns(PytestPendingDeprecationWarning):
+            assert pytest.warns(UserWarning, f) == 10
+            assert pytest.warns(UserWarning, f) == 10
+            assert pytest.warns(UserWarning, f) != "10"  # type: ignore[comparison-overlap]
 
     def test_warns_context_manager_with_kwargs(self) -> None:
         with pytest.raises(TypeError) as excinfo: