Address review: DeprecationWarning, add self to test, suppress pytest-timeout

- Change FutureWarning to DeprecationWarning for hookspec methods missing self
- Add self to HookSpec methods in test_hookspec instead of suppressing the warning
- Suppress the deprecation warning for pytest-timeout's TimeoutHooks (upstream
  fix exists but is unreleased)
- Add changelog entry for the deprecation
- Update all test references from FutureWarning to DeprecationWarning

Co-authored-by: Cursor AI <ai@cursor.sh>
Co-authored-by: Anthropic Claude Opus 4 <claude@anthropic.com>

Author: 3 people

changelog/632.removal.rst

@@ -0,0 +1 @@
+Hookspec methods defined without ``self`` as the first parameter now emit a :class:`DeprecationWarning`. Add ``self`` as the first parameter or use ``@staticmethod``.

src/pluggy/_hooks.py

@@ -291,6 +291,17 @@ def normalize_hookimpl_opts(opts: HookimplOpts) -> None:
 _PYPY = sys.implementation.name == "pypy"
 _IMPLICIT_NAMES = ("self", "cls", "obj") if _PYPY else ("self", "cls")
 
+# Qualnames whose missing-self deprecation warning is suppressed because
+# their upstream code is already fixed but not yet released.
+# Remove entries once a release with the fix is available.
+_NOSELF_WARN_SUPPRESS: frozenset[str] = frozenset(
+    {
+        # pytest-timeout >=2.3.2 has the fix, but is unreleased as of 2026-05.
+        "TimeoutHooks.pytest_timeout_set_timer",
+        "TimeoutHooks.pytest_timeout_cancel_timer",
+    }
+)
+
 
 def varnames(
     func: object, *, legacy_noself: bool = False
@@ -306,7 +317,7 @@ def varnames(
     :param legacy_noself:
         If ``True``, support hookspec classes whose methods omit ``self``.
         When the function looks like a class method but has no implicit first
-        parameter, a :class:`FutureWarning` is emitted.
+        parameter, a :class:`DeprecationWarning` is emitted.
     """
     is_bound = False
     if inspect.isclass(func):
@@ -360,14 +371,15 @@ def varnames(
         elif _is_class_method and args[0] in _IMPLICIT_NAMES:
             args = args[1:]
         elif _is_class_method and legacy_noself:
-            warnings.warn(
-                f"{qualname} is a method but its first parameter"
-                f" {args[0]!r} is not 'self'."
-                f" Add 'self' as the first parameter or use @staticmethod."
-                f" This will become an error in a future version of pluggy.",
-                FutureWarning,
-                stacklevel=2,
-            )
+            if _tail not in _NOSELF_WARN_SUPPRESS:
+                warnings.warn(
+                    f"{qualname} is a method but its first parameter"
+                    f" {args[0]!r} is not 'self'."
+                    f" Add 'self' as the first parameter or use @staticmethod."
+                    f" This will become an error in a future version of pluggy.",
+                    DeprecationWarning,
+                    stacklevel=2,
+                )
 
     return args, kwargs
 

testing/test_helpers.py

@@ -201,7 +201,7 @@ def my_hook(item, extra) -> None:
         result = varnames(MySpecs.my_hook, legacy_noself=True)
     assert result == (("item", "extra"), ())
     assert len(w) == 1
-    assert issubclass(w[0].category, FutureWarning)
+    assert issubclass(w[0].category, DeprecationWarning)
     assert "'item' is not 'self'" in str(w[0].message)
 
 
@@ -235,6 +235,28 @@ def my_hook(item, extra) -> None:
     assert len(w) == 0
 
 
+def test_varnames_legacy_noself_suppressed_for_timeout_hooks() -> None:
+    """The deprecation warning is suppressed for known upstream-fixed packages."""
+    import warnings
+
+    class TimeoutHooks:
+        def pytest_timeout_set_timer(item, settings) -> None:
+            pass  # pragma: no cover
+
+        def pytest_timeout_cancel_timer(item) -> None:
+            pass  # pragma: no cover
+
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        result_set = varnames(TimeoutHooks.pytest_timeout_set_timer, legacy_noself=True)
+        result_cancel = varnames(
+            TimeoutHooks.pytest_timeout_cancel_timer, legacy_noself=True
+        )
+    assert result_set == (("item", "settings"), ())
+    assert result_cancel == (("item",), ())
+    assert len(w) == 0
+
+
 def test_varnames_unresolvable_annotation() -> None:
     """Test that varnames works with annotations that cannot be resolved.
 

testing/test_hookcaller.py

@@ -301,19 +301,18 @@ def m13() -> None: ...
     ]
 
 
-@pytest.mark.filterwarnings("ignore::FutureWarning")
 def test_hookspec(pm: PluginManager) -> None:
     class HookSpec:
         @hookspec()
-        def he_myhook1(arg1) -> None:
+        def he_myhook1(self, arg1) -> None:
             pass
 
         @hookspec(firstresult=True)
-        def he_myhook2(arg1) -> None:
+        def he_myhook2(self, arg1) -> None:
             pass
 
         @hookspec(firstresult=False)
-        def he_myhook3(arg1) -> None:
+        def he_myhook3(self, arg1) -> None:
             pass
 
     pm.add_hookspecs(HookSpec)

testing/test_warnings.py

@@ -51,22 +51,22 @@ def my_hook(self):
 
 
 def test_hookspec_missing_self_warns(pm: PluginManager) -> None:
-    """A hookspec defined as a method without ``self`` emits a FutureWarning."""
+    """A hookspec defined as a method without ``self`` emits a DeprecationWarning."""
 
     class Api:
         @hookspec
         def my_hook(item, extra):
             pass
 
     with pytest.warns(
-        FutureWarning,
+        DeprecationWarning,
         match=r"is a method but its first parameter 'item' is not 'self'",
     ):
         pm.add_hookspecs(Api)
 
 
 def test_hookspec_with_self_no_warning(pm: PluginManager) -> None:
-    """A hookspec with ``self`` does not emit a FutureWarning."""
+    """A hookspec with ``self`` does not emit a DeprecationWarning."""
 
     class Api:
         @hookspec
@@ -79,7 +79,7 @@ def my_hook(self, item, extra):
 
 
 def test_hookspec_staticmethod_no_warning(pm: PluginManager) -> None:
-    """A hookspec using @staticmethod does not emit a FutureWarning."""
+    """A hookspec using @staticmethod does not emit a DeprecationWarning."""
 
     class Api:
         @staticmethod