Merge pull request #616 from RonnyPfannschmidt/refactor/require-python310

Require Python 3.10+ and modernize type annotations

Author: RonnyPfannschmidt

.github/workflows/main.yml

@@ -30,12 +30,11 @@ jobs:
       fail-fast: false
       matrix:
         name: [
-          "windows-py39",
+          "windows-py310",
           "windows-py314",
           "windows-pypy3",
 
           "ubuntu-py310-pytestmain",
-          "ubuntu-py39",
           "ubuntu-py310",
           "ubuntu-py311",
           "ubuntu-py312",
@@ -46,10 +45,10 @@ jobs:
         ]
 
         include:
-          - name: "windows-py39"
-            python: "3.9"
+          - name: "windows-py310"
+            python: "3.10"
             os: windows-latest
-            tox_env: "py39"
+            tox_env: "py310"
           - name: "windows-py313"
             python: "3.13"
             os: windows-latest
@@ -59,23 +58,19 @@ jobs:
             os: windows-latest
             tox_env: "py314"
           - name: "windows-pypy3"
-            python: "pypy3.9"
+            python: "pypy3.10"
             os: windows-latest
             tox_env: "pypy3"
           - name: "ubuntu-py310-pytestmain"
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310-pytestmain"
             use_coverage: true
-          - name: "ubuntu-py39"
-            python: "3.9"
-            os: ubuntu-latest
-            tox_env: "py39"
-            use_coverage: true
           - name: "ubuntu-py310"
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310"
+            use_coverage: true
           - name: "ubuntu-py311"
             python: "3.11"
             os: ubuntu-latest
@@ -97,12 +92,12 @@ jobs:
             tox_env: "py314"
             use_coverage: true
           - name: "ubuntu-pypy3"
-            python: "pypy3.9"
+            python: "pypy3.10"
             os: ubuntu-latest
             tox_env: "pypy3"
             use_coverage: true
           - name: "ubuntu-benchmark"
-            python: "3.9"
+            python: "3.10"
             os: ubuntu-latest
             tox_env: "benchmark"
 

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
     rev: v3.21.2
     hooks:
     -   id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
 -   repo: https://github.com/asottile/blacken-docs
     rev: 1.20.0
     hooks:

pyproject.toml

@@ -24,7 +24,6 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: PyPy",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
@@ -33,7 +32,7 @@ classifiers = [
 ]
 description = "plugin and hook calling mechanisms for python"
 readme = {file = "README.rst", content-type = "text/x-rst"}
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 dynamic = ["version"]
 [dependency-groups]

src/pluggy/_callers.py

@@ -9,6 +9,7 @@
 from collections.abc import Sequence
 from typing import cast
 from typing import NoReturn
+from typing import TypeAlias
 import warnings
 
 from ._hooks import HookImpl
@@ -19,7 +20,7 @@
 
 # Need to distinguish between old- and new-style hook wrappers.
 # Wrapping with a tuple is the fastest type-safe way I found to do it.
-Teardown = Generator[None, object, object]
+Teardown: TypeAlias = Generator[None, object, object]
 
 
 def run_old_style_hookwrapper(
@@ -66,10 +67,12 @@ def _raise_wrapfail(
 def _warn_teardown_exception(
     hook_name: str, hook_impl: HookImpl, e: BaseException
 ) -> None:
-    msg = "A plugin raised an exception during an old-style hookwrapper teardown.\n"
-    msg += f"Plugin: {hook_impl.plugin_name}, Hook: {hook_name}\n"
-    msg += f"{type(e).__name__}: {e}\n"
-    msg += "For more information see https://pluggy.readthedocs.io/en/stable/api_reference.html#pluggy.PluggyTeardownRaisedWarning"  # noqa: E501
+    msg = (
+        f"A plugin raised an exception during an old-style hookwrapper teardown.\n"
+        f"Plugin: {hook_impl.plugin_name}, Hook: {hook_name}\n"
+        f"{type(e).__name__}: {e}\n"
+        f"For more information see https://pluggy.readthedocs.io/en/stable/api_reference.html#pluggy.PluggyTeardownRaisedWarning"  # noqa: E501
+    )
     warnings.warn(PluggyTeardownRaisedWarning(msg), stacklevel=6)
 
 

src/pluggy/_hooks.py

@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from collections.abc import Generator
 from collections.abc import Mapping
 from collections.abc import Sequence
@@ -12,29 +13,28 @@
 import sys
 from types import ModuleType
 from typing import Any
-from typing import Callable
 from typing import Final
 from typing import final
-from typing import Optional
 from typing import overload
 from typing import TYPE_CHECKING
+from typing import TypeAlias
 from typing import TypedDict
 from typing import TypeVar
-from typing import Union
 import warnings
 
 from ._result import Result
 
 
 _T = TypeVar("_T")
 _F = TypeVar("_F", bound=Callable[..., object])
-_Namespace = Union[ModuleType, type]
-_Plugin = object
-_HookExec = Callable[
+
+_Namespace: TypeAlias = ModuleType | type
+_Plugin: TypeAlias = object
+_HookExec: TypeAlias = Callable[
     [str, Sequence["HookImpl"], Mapping[str, object], bool],
-    Union[object, list[object]],
+    object | list[object],
 ]
-_HookImplFunction = Callable[..., Union[_T, Generator[None, Result[_T], None]]]
+_HookImplFunction: TypeAlias = Callable[..., _T | Generator[None, Result[_T], None]]
 
 
 class HookspecOpts(TypedDict):
@@ -374,7 +374,9 @@ def __getattr__(self, name: str) -> HookCaller: ...
 _HookRelay = HookRelay
 
 
-_CallHistory = list[tuple[Mapping[str, object], Optional[Callable[[Any], None]]]]
+_CallHistory: TypeAlias = list[
+    tuple[Mapping[str, object], Callable[[Any], None] | None]
+]
 
 
 class HookCaller:

src/pluggy/_manager.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from collections.abc import Iterable
 from collections.abc import Mapping
 from collections.abc import Sequence
 import inspect
 import types
 from typing import Any
-from typing import Callable
 from typing import cast
 from typing import Final
 from typing import TYPE_CHECKING
+from typing import TypeAlias
 import warnings
 
 from . import _tracing
@@ -32,8 +33,10 @@
     import importlib.metadata
 
 
-_BeforeTrace = Callable[[str, Sequence[HookImpl], Mapping[str, Any]], None]
-_AfterTrace = Callable[[Result[Any], str, Sequence[HookImpl], Mapping[str, Any]], None]
+_BeforeTrace: TypeAlias = Callable[[str, Sequence[HookImpl], Mapping[str, Any]], None]
+_AfterTrace: TypeAlias = Callable[
+    [Result[Any], str, Sequence[HookImpl], Mapping[str, Any]], None
+]
 
 
 def _warn_for_function(warning: Warning, function: Callable[..., object]) -> None:

src/pluggy/_result.py

@@ -4,16 +4,16 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from types import TracebackType
-from typing import Callable
 from typing import cast
 from typing import final
 from typing import Generic
-from typing import Optional
+from typing import TypeAlias
 from typing import TypeVar
 
 
-_ExcInfo = tuple[type[BaseException], BaseException, Optional[TracebackType]]
+_ExcInfo: TypeAlias = tuple[type[BaseException], BaseException, TracebackType | None]
 ResultType = TypeVar("ResultType")
 
 

src/pluggy/_tracing.py

@@ -4,9 +4,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from collections.abc import Sequence
 from typing import Any
-from typing import Callable
 
 
 _Writer = Callable[[str], object]
@@ -32,7 +32,7 @@ def _format_message(self, tags: Sequence[str], args: Sequence[object]) -> str:
         content = " ".join(map(str, args))
         indent = "  " * self.indent
 
-        lines = ["{}{} [{}]\n".format(indent, content, ":".join(tags))]
+        lines = [f"{indent}{content} [{':'.join(tags)}]\n"]
 
         for name, value in extra.items():
             lines.append(f"{indent}    {name}: {value}\n")
@@ -42,11 +42,7 @@ def _format_message(self, tags: Sequence[str], args: Sequence[object]) -> str:
     def _processmessage(self, tags: tuple[str, ...], args: tuple[object, ...]) -> None:
         if self._writer is not None and args:
             self._writer(self._format_message(tags, args))
-        try:
-            processor = self._tags2proc[tags]
-        except KeyError:
-            pass
-        else:
+        if processor := self._tags2proc.get(tags):
             processor(tags, args)
 
     def setwriter(self, writer: _Writer | None) -> None:

testing/test_helpers.py

@@ -1,6 +1,6 @@
+from collections.abc import Callable
 from functools import wraps
 from typing import Any
-from typing import Callable
 from typing import cast
 from typing import TypeVar
 

testing/test_hookcaller.py

@@ -1,6 +1,6 @@
+from collections.abc import Callable
 from collections.abc import Generator
 from collections.abc import Sequence
-from typing import Callable
 from typing import TypeVar
 
 import pytest