Drop support for EOL Python 3.9

Author: hugovk

.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,19 +58,14 @@ jobs:
             os: windows-latest
             tox_env: "py314"
           - name: "windows-pypy3"
-            python: "pypy3.9"
+            python: "pypy3.11"
             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
@@ -97,12 +91,12 @@ jobs:
             tox_env: "py314"
             use_coverage: true
           - name: "ubuntu-pypy3"
-            python: "pypy3.9"
+            python: "pypy3.11"
             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,12 +28,12 @@ repos:
     rev: v3.21.0
     hooks:
     -   id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
 -   repo: https://github.com/asottile/blacken-docs
     rev: 1.20.0
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==24.2.0]
+        additional_dependencies: [black==25.9.0]
 -   repo: local
     hooks:
     -   id: rst

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"]
 [project.optional-dependencies]

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,26 @@
 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 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]
+_Namespace = ModuleType | type
 _Plugin = object
 _HookExec = 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 = Callable[..., _T | Generator[None, Result[_T], None]]
 
 
 class HookspecOpts(TypedDict):
@@ -374,7 +372,7 @@ def __getattr__(self, name: str) -> HookCaller: ...
 _HookRelay = HookRelay
 
 
-_CallHistory = list[tuple[Mapping[str, object], Optional[Callable[[Any], None]]]]
+_CallHistory = list[tuple[Mapping[str, object], Callable[[Any], None] | None]]
 
 
 class HookCaller:

src/pluggy/_manager.py

@@ -1,12 +1,12 @@
 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

src/pluggy/_result.py

@@ -4,16 +4,15 @@
 
 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 TypeVar
 
 
-_ExcInfo = tuple[type[BaseException], BaseException, Optional[TracebackType]]
+_ExcInfo = 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]

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

testing/test_multicall.py

@@ -1,7 +1,6 @@
+from collections.abc import Callable
 from collections.abc import Mapping
 from collections.abc import Sequence
-from typing import Callable
-from typing import Union
 
 import pytest
 
@@ -20,7 +19,7 @@ def MC(
     methods: Sequence[Callable[..., object]],
     kwargs: Mapping[str, object],
     firstresult: bool = False,
-) -> Union[object, list[object]]:
+) -> object | list[object]:
     caller = _multicall
     hookfuncs = []
     for method in methods: