fix: drop Python 3.9 support to fix CI (#537)

bdraco · web-flow · commit 04fb21c6ba64 · 2025-11-16T08:41:22.000-06:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
       - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v5
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
   # Make sure commit messages follow the conventional commits convention:
@@ -36,7 +36,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -36,7 +36,7 @@ repos:
     rev: v3.21.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.3
     hooks:
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,6 @@ classifiers = [
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -35,7 +34,7 @@ script = "build_ext.py"
 "Changelog" = "https://github.com/bluetooth-devices/dbus-fast/blob/main/CHANGELOG.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9"
+python = ">=3.10"
 
 # duplicated in docs/requirements.txt for readthedocs compatibility
 [tool.poetry.group.docs.dependencies]
@@ -109,7 +108,7 @@ requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3,<3.3.0', "poetry-core>=1.0
 build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
-target-version = "py39"
+target-version = "py310"
 line-length = 88
 
 [tool.ruff.lint]
diff --git a/src/dbus_fast/_private/marshaller.py b/src/dbus_fast/_private/marshaller.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from struct import Struct, error
-from typing import Any, Callable
+from typing import Any
 
 from ..signature import SignatureType, Variant, get_signature_tree
 
diff --git a/src/dbus_fast/_private/unmarshaller.py b/src/dbus_fast/_private/unmarshaller.py
@@ -5,9 +5,9 @@
 import io
 import socket
 import sys
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from struct import Struct
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from ..constants import MESSAGE_FLAG_MAP, MESSAGE_TYPE_MAP, MessageFlag
 from ..errors import InvalidMessageError
diff --git a/src/dbus_fast/_private/util.py b/src/dbus_fast/_private/util.py
@@ -2,7 +2,8 @@
 
 import ast
 import inspect
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from ..signature import SignatureTree, SignatureType, Variant, get_signature_tree
 
diff --git a/src/dbus_fast/aio/message_bus.py b/src/dbus_fast/aio/message_bus.py
@@ -6,9 +6,10 @@
 import logging
 import socket
 from collections import deque
+from collections.abc import Callable
 from copy import copy
 from functools import partial
-from typing import Any, Callable
+from typing import Any
 
 from .. import introspection as intr
 from ..auth import Authenticator, AuthExternal
diff --git a/src/dbus_fast/aio/message_reader.py b/src/dbus_fast/aio/message_reader.py
@@ -2,8 +2,8 @@
 
 import logging
 import socket
+from collections.abc import Callable
 from functools import partial
-from typing import Callable
 
 from .._private.unmarshaller import Unmarshaller
 from ..message import Message
diff --git a/src/dbus_fast/auth.py b/src/dbus_fast/auth.py
@@ -1,6 +1,5 @@
 import enum
 import os
-from typing import Optional
 
 from .errors import AuthError
 
@@ -65,10 +64,10 @@ class AuthExternal(Authenticator):
     :sealso: https://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
     """
 
-    def __init__(self, uid: Optional[int] = None) -> None:
+    def __init__(self, uid: int | None = None) -> None:
         self.negotiate_unix_fd: bool = False
         self.negotiating_fds: bool = False
-        self.uid: Optional[int] = uid
+        self.uid: int | None = uid
 
     def _authentication_start(self, negotiate_unix_fd: bool = False) -> str:
         self.negotiate_unix_fd = negotiate_unix_fd
diff --git a/src/dbus_fast/errors.py b/src/dbus_fast/errors.py
@@ -1,6 +1,3 @@
-from typing import Optional, Union
-
-
 class SignatureBodyMismatchError(ValueError):
     pass
 
@@ -60,7 +57,7 @@ def __init__(self, member: str) -> None:
 
 class DBusError(Exception):
     def __init__(
-        self, type_: Union[ErrorType, str], text: str, reply: Optional[Message] = None
+        self, type_: ErrorType | str, text: str, reply: Message | None = None
     ) -> None:
         super().__init__(text)
 
diff --git a/src/dbus_fast/glib/message_bus.py b/src/dbus_fast/glib/message_bus.py
@@ -1,7 +1,7 @@
 import io
 import logging
 import traceback
-from typing import Callable, Optional
+from collections.abc import Callable
 
 from .. import introspection as intr
 from .._private.unmarshaller import Unmarshaller
@@ -161,9 +161,9 @@ class MessageBus(BaseMessageBus):
 
     def __init__(
         self,
-        bus_address: Optional[str] = None,
+        bus_address: str | None = None,
         bus_type: BusType = BusType.SESSION,
-        auth: Optional[Authenticator] = None,
+        auth: Authenticator | None = None,
     ):
         if _import_error:
             raise _import_error
@@ -188,9 +188,8 @@ def _on_message(self, msg: Message) -> None:
 
     def connect(
         self,
-        connect_notify: Optional[
-            Callable[["MessageBus", Optional[Exception]], None]
-        ] = None,
+        connect_notify: None
+        | (Callable[["MessageBus", Exception | None], None]) = None,
     ):
         """Connect this message bus to the DBus daemon.
 
@@ -277,9 +276,8 @@ def connect_notify(bus, err):
     def call(
         self,
         msg: Message,
-        reply_notify: Optional[
-            Callable[[Optional[Message], Optional[Exception]], None]
-        ] = None,
+        reply_notify: None
+        | (Callable[[Message | None, Exception | None], None]) = None,
     ):
         """Send a method call and asynchronously wait for a reply from the DBus
         daemon.
@@ -293,7 +291,7 @@ def call(
         BaseMessageBus._check_callback_type(reply_notify)
         self._call(msg, reply_notify)
 
-    def call_sync(self, msg: Message) -> Optional[Message]:
+    def call_sync(self, msg: Message) -> Message | None:
         """Send a method call and synchronously wait for a reply from the DBus
         daemon.
 
diff --git a/src/dbus_fast/glib/proxy_object.py b/src/dbus_fast/glib/proxy_object.py
@@ -1,5 +1,4 @@
 import xml.etree.ElementTree as ET
-from typing import Union
 
 from .. import introspection as intr
 from ..constants import ErrorType
@@ -307,7 +306,7 @@ def __init__(
         self,
         bus_name: str,
         path: str,
-        introspection: Union[intr.Node, str, ET.Element],
+        introspection: intr.Node | str | ET.Element,
         bus: BaseMessageBus,
     ):
         super().__init__(bus_name, path, introspection, bus, ProxyInterface)
diff --git a/src/dbus_fast/introspection.py b/src/dbus_fast/introspection.py
@@ -1,5 +1,4 @@
 import xml.etree.ElementTree as ET
-from typing import Optional, Union
 
 from .constants import ArgDirection, PropertyAccess
 from .errors import InvalidIntrospectionError
@@ -50,10 +49,10 @@ class Arg:
 
     def __init__(
         self,
-        signature: Union[SignatureType, str],
-        direction: Optional[ArgDirection] = None,
-        name: Optional[str] = None,
-        annotations: Optional[dict[str, str]] = None,
+        signature: SignatureType | str,
+        direction: ArgDirection | None = None,
+        name: str | None = None,
+        annotations: dict[str, str] | None = None,
     ):
         type_ = None
         if type(signature) is SignatureType:
@@ -133,8 +132,8 @@ class Signal:
     def __init__(
         self,
         name: str,
-        args: Optional[list[Arg]] = None,
-        annotations: Optional[dict[str, str]] = None,
+        args: list[Arg] | None = None,
+        annotations: dict[str, str] | None = None,
     ):
         if name is not None:
             assert_member_name_valid(name)
@@ -210,7 +209,7 @@ def __init__(
         name: str,
         in_args: list[Arg] = [],
         out_args: list[Arg] = [],
-        annotations: Optional[dict[str, str]] = None,
+        annotations: dict[str, str] | None = None,
     ):
         assert_member_name_valid(name)
 
@@ -295,7 +294,7 @@ def __init__(
         name: str,
         signature: str,
         access: PropertyAccess = PropertyAccess.READWRITE,
-        annotations: Optional[dict[str, str]] = None,
+        annotations: dict[str, str] | None = None,
         validate: bool = True,
     ):
         if validate:
@@ -373,10 +372,10 @@ class Interface:
     def __init__(
         self,
         name: str,
-        methods: Optional[list[Method]] = None,
-        signals: Optional[list[Signal]] = None,
-        properties: Optional[list[Property]] = None,
-        annotations: Optional[dict[str, str]] = None,
+        methods: list[Method] | None = None,
+        signals: list[Signal] | None = None,
+        properties: list[Property] | None = None,
+        annotations: dict[str, str] | None = None,
     ):
         assert_interface_name_valid(name)
 
@@ -467,8 +466,8 @@ class Node:
 
     def __init__(
         self,
-        name: Optional[str] = None,
-        interfaces: Optional[list[Interface]] = None,
+        name: str | None = None,
+        interfaces: list[Interface] | None = None,
         is_root: bool = True,
     ):
         if not is_root and not name:
@@ -576,7 +575,7 @@ def indent(elem, level=0):
         return header + ET.tostring(xml, encoding="unicode").rstrip()
 
     @staticmethod
-    def default(name: Optional[str] = None) -> "Node":
+    def default(name: str | None = None) -> "Node":
         """Create a :class:`Node` with the default interfaces supported by this library.
 
         The default interfaces include:
diff --git a/src/dbus_fast/message.py b/src/dbus_fast/message.py
diff --git a/src/dbus_fast/message_bus.py b/src/dbus_fast/message_bus.py
diff --git a/src/dbus_fast/proxy_object.py b/src/dbus_fast/proxy_object.py
diff --git a/src/dbus_fast/service.py b/src/dbus_fast/service.py
diff --git a/src/dbus_fast/signature.py b/src/dbus_fast/signature.py
