Bump bleak to 2.0.0 (home-assistant#157766)

Author: bdraco

homeassistant/components/bluetooth/manifest.json

@@ -15,7 +15,7 @@
   ],
   "quality_scale": "internal",
   "requirements": [
-    "bleak==1.0.1",
+    "bleak==2.0.0",
     "bleak-retry-connector==4.4.3",
     "bluetooth-adapters==2.1.0",
     "bluetooth-auto-recovery==1.5.3",

homeassistant/package_constraints.txt

@@ -21,7 +21,7 @@ av==16.0.1
 awesomeversion==25.8.0
 bcrypt==5.0.0
 bleak-retry-connector==4.4.3
-bleak==1.0.1
+bleak==2.0.0
 bluetooth-adapters==2.1.0
 bluetooth-auto-recovery==1.5.3
 bluetooth-data-tools==1.28.4

requirements_all.txt

@@ -3,6 +3,7 @@
 from collections.abc import Generator, Iterable
 from contextlib import contextmanager
 import itertools
+from platform import system
 import time
 from typing import Any
 from unittest.mock import MagicMock, PropertyMock, patch
@@ -37,6 +38,7 @@
     "inject_advertisement_with_time_and_source_connectable",
     "inject_bluetooth_service_info",
     "patch_all_discovered_devices",
+    "patch_bleak_backend_type",
     "patch_bluetooth_time",
     "patch_discovered_devices",
 )
@@ -76,6 +78,47 @@ def patch_bluetooth_time(mock_time: float) -> None:
         yield
 
 
+@contextmanager
+def patch_bleak_backend_type() -> Generator[None]:
+    """Patch bleak backend type based on current platform."""
+    platform = system()
+
+    if platform == "Darwin":
+        from bleak.backends.corebluetooth.client import (  # noqa: PLC0415
+            BleakClientCoreBluetooth,
+        )
+        from bleak.backends.corebluetooth.scanner import (  # noqa: PLC0415
+            BleakScannerCoreBluetooth,
+        )
+
+        scanner_backend = (BleakScannerCoreBluetooth, "CoreBluetooth")
+        client_backend = (BleakClientCoreBluetooth, "CoreBluetooth")
+    elif platform == "Linux":
+        from bleak.backends.bluezdbus.client import (  # noqa: PLC0415
+            BleakClientBlueZDBus,
+        )
+        from bleak.backends.bluezdbus.scanner import (  # noqa: PLC0415
+            BleakScannerBlueZDBus,
+        )
+
+        scanner_backend = (BleakScannerBlueZDBus, "BlueZ")
+        client_backend = (BleakClientBlueZDBus, "BlueZ")
+    else:
+        raise RuntimeError(f"Unsupported platform for Bluetooth testing: {platform}")
+
+    with (
+        patch(
+            "bleak.get_platform_scanner_backend_type",
+            return_value=scanner_backend,
+        ),
+        patch(
+            "bleak.get_platform_client_backend_type",
+            return_value=client_backend,
+        ),
+    ):
+        yield
+
+
 def generate_advertisement_data(**kwargs: Any) -> AdvertisementData:
     """Generate advertisement data with defaults."""
     new = kwargs.copy()

requirements_test_all.txt

@@ -17,6 +17,7 @@
     HCI1_SOURCE_ADDRESS,
     NON_CONNECTABLE_REMOTE_SOURCE_ADDRESS,
     FakeScanner,
+    patch_bleak_backend_type,
 )
 
 
@@ -88,7 +89,7 @@ def mock_operating_system_90():
 def macos_adapter() -> Generator[None]:
     """Fixture that mocks the macos adapter."""
     with (
-        patch("bleak.get_platform_scanner_backend_type"),
+        patch_bleak_backend_type(),
         patch(
             "homeassistant.components.bluetooth.platform.system",
             return_value="Darwin",

tests/components/bluetooth/__init__.py

@@ -26,6 +26,7 @@
     generate_ble_device,
     inject_advertisement,
     inject_advertisement_with_source,
+    patch_bleak_backend_type,
 )
 
 
@@ -595,7 +596,7 @@ async def async_get_device_by_address(self, address: str) -> BLEDevice | None:
     ]
 
     client = HaBleakClientWrapper(switchbot_proxy_device_no_connection_slot)
-    with patch("bleak.get_platform_client_backend_type"):
+    with patch_bleak_backend_type():
         await client.connect()
     assert client.is_connected is True
     client.set_disconnected_callback(lambda client: None)

tests/components/bluetooth/conftest.py

@@ -1,7 +1,5 @@
 """Tests for the Bluetooth integration."""
 
-from unittest.mock import patch
-
 import bleak
 from habluetooth.usage import (
     install_multiple_bleak_catcher,
@@ -12,7 +10,7 @@
 
 from homeassistant.core import HomeAssistant
 
-from . import generate_ble_device
+from . import generate_ble_device, patch_bleak_backend_type
 
 MOCK_BLE_DEVICE = generate_ble_device(
     "00:00:00:00:00:00",
@@ -31,7 +29,7 @@ async def test_multiple_bleak_scanner_instances(hass: HomeAssistant) -> None:
 
     uninstall_multiple_bleak_catcher()
 
-    with patch("bleak.get_platform_scanner_backend_type"):
+    with patch_bleak_backend_type():
         instance = bleak.BleakScanner()
 
     assert not isinstance(instance, HaBleakScannerWrapper)