* build_and_test.yml workflow_dispatch trigger added

* legacy `collections.abc` imports replacement with `typing_extensions`
  cause current minimum `typing_extensions>=4.7` version already supports it
* removed deprecated imports from __future__
* Undefined annotations fixed

Author: o-murphy

.github/workflows/build_and_test.yml

@@ -7,6 +7,7 @@ on:
     pull_request:
         branches: [ master, develop ]
         paths: [ 'bleak/**', 'tests/**' ]
+    workflow_dispatch:
 
 jobs:
     build_desktop:

bleak/__init__.py

@@ -2,8 +2,6 @@
 
 """Top-level package for bleak."""
 
-from __future__ import annotations
-
 __author__ = """Henrik Blidh"""
 __email__ = "[email protected]"
 
@@ -14,21 +12,27 @@
 import os
 import sys
 import uuid
-from collections.abc import AsyncGenerator, Awaitable, Callable, Iterable
 from types import TracebackType
-from typing import Any, Literal, Optional, TypedDict, Union, cast, overload
+from typing import (
+    Any,
+    AsyncGenerator,
+    Awaitable,
+    Callable,
+    Iterable,
+    Literal,
+    Optional,
+    TypedDict,
+    Union,
+    cast,
+    overload,
+)
 
-if sys.version_info < (3, 12):
-    from typing_extensions import Buffer
-else:
-    from collections.abc import Buffer
+from typing_extensions import Buffer, Never, Self, Unpack, assert_never
 
 if sys.version_info < (3, 11):
     from async_timeout import timeout as async_timeout
-    from typing_extensions import Never, Self, Unpack, assert_never
 else:
     from asyncio import timeout as async_timeout
-    from typing import Never, Self, Unpack, assert_never
 
 from bleak.args.bluez import BlueZScannerArgs
 from bleak.args.corebluetooth import CBScannerArgs, CBStartNotifyArgs
@@ -481,7 +485,7 @@ class BleakClient:
     def __init__(
         self,
         address_or_ble_device: Union[BLEDevice, str],
-        disconnected_callback: Optional[Callable[[BleakClient], None]] = None,
+        disconnected_callback: Optional[Callable[["BleakClient"], None]] = None,
         services: Optional[Iterable[str]] = None,
         *,
         timeout: float = 10.0,

bleak/args/corebluetooth.py

@@ -4,8 +4,7 @@
 -------------------------------
 """
 
-from collections.abc import Callable
-from typing import Optional, TypedDict
+from typing import Callable, Optional, TypedDict
 
 
 class CBScannerArgs(TypedDict, total=False):

bleak/backends/bluezdbus/advertisement_monitor.py

@@ -14,8 +14,7 @@
         assert False, "This backend is only available on Linux"
 
 import logging
-from collections.abc import Iterable
-from typing import Any, no_type_check
+from typing import Any, Iterable, no_type_check
 from warnings import warn
 
 from dbus_fast import PropertyAccess

bleak/backends/bluezdbus/client.py

@@ -13,15 +13,10 @@
 import logging
 import os
 import warnings
-from collections.abc import Callable
 from contextlib import AsyncExitStack
-from typing import Any, Optional, Union
+from typing import Any, Callable, Optional, Union
 
-if sys.version_info < (3, 12):
-    from typing_extensions import Buffer, override
-else:
-    from collections.abc import Buffer
-    from typing import override
+from typing_extensions import Buffer, override
 
 if sys.version_info < (3, 11):
     from async_timeout import timeout as async_timeout

bleak/backends/bluezdbus/manager.py

@@ -18,8 +18,7 @@
 import logging
 import os
 from collections import defaultdict
-from collections.abc import Callable, Coroutine, MutableMapping
-from typing import Any, NamedTuple, Optional, cast
+from typing import Any, Callable, Coroutine, MutableMapping, NamedTuple, Optional, cast
 from weakref import WeakKeyDictionary
 
 from dbus_fast import BusType, Message, MessageType, Variant, unpack_variants

bleak/backends/bluezdbus/scanner.py

@@ -6,16 +6,11 @@
         assert False, "This backend is only available on Linux"
 
 import logging
-from collections.abc import Callable, Coroutine
-from typing import Any, Literal, Optional
+from typing import Any, Callable, Coroutine, Literal, Optional
 from warnings import warn
 
-if sys.version_info < (3, 12):
-    from typing_extensions import override
-else:
-    from typing import override
-
 from dbus_fast import Variant
+from typing_extensions import override
 
 from bleak.args.bluez import BlueZDiscoveryFilters as _BlueZDiscoveryFilters
 from bleak.args.bluez import BlueZScannerArgs as _BlueZScannerArgs

bleak/backends/bluezdbus/signals.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import annotations
-
 import sys
 from typing import TYPE_CHECKING
 
@@ -144,7 +142,7 @@ def __init__(
             self.args = None
 
     @staticmethod
-    def parse(rules: str) -> MatchRules:
+    def parse(rules: str) -> "MatchRules":
         return MatchRules(**dict(r.split("=") for r in rules.split(",")))
 
     def __str__(self) -> str:

bleak/backends/characteristic.py

@@ -6,8 +6,7 @@
 from __future__ import annotations
 
 import enum
-from collections.abc import Callable
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any, Callable, Union
 from uuid import UUID
 
 from bleak.assigned_numbers import CharacteristicPropertyName

bleak/backends/client.py

@@ -7,13 +7,9 @@
 import os
 import platform
 import sys
-from collections.abc import Callable
-from typing import Any, Optional, Union
+from typing import Any, Callable, Optional, Union
 
-if sys.version_info < (3, 12):
-    from typing_extensions import Buffer
-else:
-    from collections.abc import Buffer
+from typing_extensions import Buffer
 
 from bleak.backends.characteristic import BleakGATTCharacteristic
 from bleak.backends.descriptor import BleakGATTDescriptor