diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index 33914f3457f760..cf3ee8e0db9ef8 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -15,12 +15,12 @@
],
"quality_scale": "internal",
"requirements": [
- "bleak==0.22.3",
- "bleak-retry-connector==3.9.0",
- "bluetooth-adapters==0.21.4",
+ "bleak==1.0.1",
+ "bleak-retry-connector==4.0.0",
+ "bluetooth-adapters==2.0.0",
"bluetooth-auto-recovery==1.5.2",
"bluetooth-data-tools==1.28.2",
"dbus-fast==2.43.0",
- "habluetooth==3.49.0"
+ "habluetooth==4.0.1"
]
}
diff --git a/homeassistant/components/eq3btsmart/manifest.json b/homeassistant/components/eq3btsmart/manifest.json
index 62128077f2febe..472384fdf7d778 100644
--- a/homeassistant/components/eq3btsmart/manifest.json
+++ b/homeassistant/components/eq3btsmart/manifest.json
@@ -22,5 +22,5 @@
"integration_type": "device",
"iot_class": "local_polling",
"loggers": ["eq3btsmart"],
- "requirements": ["eq3btsmart==2.1.0", "bleak-esphome==2.16.0"]
+ "requirements": ["eq3btsmart==2.1.0", "bleak-esphome==3.1.0"]
}
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index 01e04df6db8985..17c6bba002de34 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -19,7 +19,7 @@
"requirements": [
"aioesphomeapi==34.1.0",
"esphome-dashboard-api==1.3.0",
- "bleak-esphome==2.16.0"
+ "bleak-esphome==3.1.0"
],
"zeroconf": ["_esphomelib._tcp.local."]
}
diff --git a/homeassistant/components/keymitt_ble/__init__.py b/homeassistant/components/keymitt_ble/__init__.py
index 01948006852851..0f71519e420fd7 100644
--- a/homeassistant/components/keymitt_ble/__init__.py
+++ b/homeassistant/components/keymitt_ble/__init__.py
@@ -2,14 +2,42 @@
from __future__ import annotations
-from microbot import MicroBotApiClient
+from collections.abc import Generator
+from contextlib import contextmanager
+
+import bleak
from homeassistant.components import bluetooth
from homeassistant.const import CONF_ACCESS_TOKEN, CONF_ADDRESS, Platform
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
-from .coordinator import MicroBotConfigEntry, MicroBotDataUpdateCoordinator
+
+@contextmanager
+def patch_unused_bleak_discover_import() -> Generator[None]:
+ """Patch bleak.discover import in microbot. It is unused and was removed in bleak 1.0.0."""
+
+ def getattr_bleak(name: str) -> object:
+ if name == "discover":
+ return None
+ raise AttributeError
+
+ original_func = bleak.__dict__.get("__getattr__")
+ bleak.__dict__["__getattr__"] = getattr_bleak
+ try:
+ yield
+ finally:
+ if original_func is not None:
+ bleak.__dict__["__getattr__"] = original_func
+
+
+with patch_unused_bleak_discover_import():
+ from microbot import MicroBotApiClient
+
+from .coordinator import ( # noqa: E402
+ MicroBotConfigEntry,
+ MicroBotDataUpdateCoordinator,
+)
PLATFORMS: list[str] = [Platform.SWITCH]
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 2b891e1678d409..e5cb910b0f6b7e 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -20,9 +20,9 @@ audioop-lts==0.2.1
av==13.1.0
awesomeversion==25.5.0
bcrypt==4.3.0
-bleak-retry-connector==3.9.0
-bleak==0.22.3
-bluetooth-adapters==0.21.4
+bleak-retry-connector==4.0.0
+bleak==1.0.1
+bluetooth-adapters==2.0.0
bluetooth-auto-recovery==1.5.2
bluetooth-data-tools==1.28.2
cached-ipaddress==0.10.0
@@ -34,7 +34,7 @@ dbus-fast==2.43.0
fnv-hash-fast==1.5.0
go2rtc-client==0.2.1
ha-ffmpeg==3.2.2
-habluetooth==3.49.0
+habluetooth==4.0.1
hass-nabucasa==0.105.0
hassil==2.2.3
home-assistant-bluetooth==1.13.1
diff --git a/requirements_all.txt b/requirements_all.txt
index 09142fb10a829a..c6d1a8abce3764 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -616,13 +616,13 @@ bizkaibus==0.1.1
# homeassistant.components.eq3btsmart
# homeassistant.components.esphome
-bleak-esphome==2.16.0
+bleak-esphome==3.1.0
# homeassistant.components.bluetooth
-bleak-retry-connector==3.9.0
+bleak-retry-connector==4.0.0
# homeassistant.components.bluetooth
-bleak==0.22.3
+bleak==1.0.1
# homeassistant.components.blebox
blebox-uniapi==2.5.0
@@ -643,7 +643,7 @@ bluemaestro-ble==0.4.1
# bluepy==1.3.0
# homeassistant.components.bluetooth
-bluetooth-adapters==0.21.4
+bluetooth-adapters==2.0.0
# homeassistant.components.bluetooth
bluetooth-auto-recovery==1.5.2
@@ -1124,7 +1124,7 @@ ha-silabs-firmware-client==0.2.0
habiticalib==0.4.0
# homeassistant.components.bluetooth
-habluetooth==3.49.0
+habluetooth==4.0.1
# homeassistant.components.cloud
hass-nabucasa==0.105.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 7cc3f43014abe0..1fd34c78a71e03 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -550,13 +550,13 @@ bimmer-connected[china]==0.17.2
# homeassistant.components.eq3btsmart
# homeassistant.components.esphome
-bleak-esphome==2.16.0
+bleak-esphome==3.1.0
# homeassistant.components.bluetooth
-bleak-retry-connector==3.9.0
+bleak-retry-connector==4.0.0
# homeassistant.components.bluetooth
-bleak==0.22.3
+bleak==1.0.1
# homeassistant.components.blebox
blebox-uniapi==2.5.0
@@ -574,7 +574,7 @@ bluemaestro-ble==0.4.1
# bluepy==1.3.0
# homeassistant.components.bluetooth
-bluetooth-adapters==0.21.4
+bluetooth-adapters==2.0.0
# homeassistant.components.bluetooth
bluetooth-auto-recovery==1.5.2
@@ -985,7 +985,7 @@ ha-silabs-firmware-client==0.2.0
habiticalib==0.4.0
# homeassistant.components.bluetooth
-habluetooth==3.49.0
+habluetooth==4.0.1
# homeassistant.components.cloud
hass-nabucasa==0.105.0
diff --git a/script/hassfest/requirements.py b/script/hassfest/requirements.py
index a2115ae55915e4..f33fc25489d102 100644
--- a/script/hassfest/requirements.py
+++ b/script/hassfest/requirements.py
@@ -27,6 +27,7 @@
"aiohttp": "SemVer",
"attrs": "CalVer",
"awesomeversion": "CalVer",
+ "bleak": "SemVer",
"grpcio": "SemVer",
"httpx": "SemVer",
"mashumaro": "SemVer",
@@ -298,10 +299,6 @@
# - domain is the integration domain
# - package is the package (can be transitive) referencing the dependency
# - dependencyX should be the name of the referenced dependency
- "bluetooth": {
- # https://github.com/hbldh/bleak/pull/1718 (not yet released)
- "homeassistant": {"bleak"}
- },
"python_script": {
# Security audits are needed for each Python version
"homeassistant": {"restrictedpython"}
@@ -502,17 +499,9 @@ def get_requirements(integration: Integration, packages: set[str]) -> set[str]:
continue
# Check for restrictive version limits on Python
- if (
- (requires_python := metadata(package)["Requires-Python"])
- and not all(
- _is_dependency_version_range_valid(version_part, "SemVer")
- for version_part in requires_python.split(",")
- )
- # "bleak" is a transient dependency of 53 integrations, and we don't
- # want to add the whole list to PYTHON_VERSION_CHECK_EXCEPTIONS
- # This extra check can be removed when bleak is updated
- # https://github.com/hbldh/bleak/pull/1718
- and (package in packages or package != "bleak")
+ if (requires_python := metadata(package)["Requires-Python"]) and not all(
+ _is_dependency_version_range_valid(version_part, "SemVer")
+ for version_part in requires_python.split(",")
):
needs_python_version_check_exception = True
integration.add_warning_or_error(
diff --git a/tests/components/bluetooth/__init__.py b/tests/components/bluetooth/__init__.py
index 31d301e2dac8fd..19863f39709cd0 100644
--- a/tests/components/bluetooth/__init__.py
+++ b/tests/components/bluetooth/__init__.py
@@ -53,7 +53,6 @@
BLE_DEVICE_DEFAULTS = {
"name": None,
- "rssi": -127,
"details": None,
}
@@ -89,7 +88,6 @@ def generate_ble_device(
address: str | None = None,
name: str | None = None,
details: Any | None = None,
- rssi: int | None = None,
**kwargs: Any,
) -> BLEDevice:
"""Generate a BLEDevice with defaults."""
@@ -100,8 +98,6 @@ def generate_ble_device(
new["name"] = name
if details is not None:
new["details"] = details
- if rssi is not None:
- new["rssi"] = rssi
for key, value in BLE_DEVICE_DEFAULTS.items():
new.setdefault(key, value)
return BLEDevice(**new)
diff --git a/tests/components/bluetooth/test_models.py b/tests/components/bluetooth/test_models.py
index d36741b4d5d0a3..ddf254b65a80a3 100644
--- a/tests/components/bluetooth/test_models.py
+++ b/tests/components/bluetooth/test_models.py
@@ -124,7 +124,7 @@ async def async_get_device_by_address(self, address: str) -> BLEDevice | None:
"bleak.backends.bluezdbus.client.BleakClientBlueZDBus.is_connected", True
),
):
- assert await client.connect() is True
+ await client.connect()
assert client.is_connected is True
client.set_disconnected_callback(lambda client: None)
await client.disconnect()
@@ -215,7 +215,7 @@ async def async_get_device_by_address(self, address: str) -> BLEDevice | None:
"bleak.backends.bluezdbus.client.BleakClientBlueZDBus.is_connected", True
),
):
- assert await client.connect() is True
+ await client.connect()
assert client.is_connected is True
client.set_disconnected_callback(lambda client: None)
await client.disconnect()
diff --git a/tests/components/bluetooth/test_wrappers.py b/tests/components/bluetooth/test_wrappers.py
index bfe7445f614cf9..d57d78c2831386 100644
--- a/tests/components/bluetooth/test_wrappers.py
+++ b/tests/components/bluetooth/test_wrappers.py
@@ -92,6 +92,10 @@ class FakeBleakClient(BaseFakeBleakClient):
async def connect(self, *args, **kwargs):
"""Connect."""
+
+ @property
+ def is_connected(self):
+ """Connected."""
return True
@@ -100,6 +104,10 @@ class FakeBleakClientFailsToConnect(BaseFakeBleakClient):
async def connect(self, *args, **kwargs):
"""Connect."""
+
+ @property
+ def is_connected(self):
+ """Not connected."""
return False
@@ -110,6 +118,11 @@ async def connect(self, *args, **kwargs):
"""Connect."""
raise ConnectionError("Test exception")
+ @property
+ def is_connected(self):
+ """Not connected."""
+ return False
+
def _generate_ble_device_and_adv_data(
interface: str, mac: str, rssi: int
@@ -219,7 +232,8 @@ async def test_test_switch_adapters_when_out_of_slots(
):
ble_device = hci0_device_advs["00:00:00:00:00:01"][0]
client = bleak.BleakClient(ble_device)
- assert await client.connect() is True
+ await client.connect()
+ assert client.is_connected is True
assert allocate_slot_mock.call_count == 1
assert release_slot_mock.call_count == 0
@@ -251,7 +265,8 @@ def _allocate_slot_mock(ble_device: BLEDevice):
):
ble_device = hci0_device_advs["00:00:00:00:00:03"][0]
client = bleak.BleakClient(ble_device)
- assert await client.connect() is True
+ await client.connect()
+ assert client.is_connected is True
assert release_slot_mock.call_count == 0
cancel_hci0()
@@ -278,7 +293,8 @@ async def test_release_slot_on_connect_failure(
):
ble_device = hci0_device_advs["00:00:00:00:00:01"][0]
client = bleak.BleakClient(ble_device)
- assert await client.connect() is False
+ await client.connect()
+ assert client.is_connected is False
assert allocate_slot_mock.call_count == 1
assert release_slot_mock.call_count == 1
@@ -335,13 +351,18 @@ class FakeBleakClient(BaseFakeBleakClient):
async def connect(self, *args, **kwargs):
"""Connect."""
+
+ @property
+ def is_connected(self):
+ """Connected."""
return True
with patch(
"habluetooth.wrappers.get_platform_client_backend_type",
return_value=FakeBleakClient,
):
- assert await client.connect() is True
+ await client.connect()
+ assert client.is_connected is True
cancel_hci0()
cancel_hci1()
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy