evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump habluetooth to 3.0.1 (#116663)

Browse source
This commit is contained in:
J. Nick Koston 2024-05-03 05:15:51 -05:00 • committed by GitHub
parent 395fe0f47f
commit 2b2b46c774
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 77 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
homeassistant/components/bluetooth/manager.py
View file

@ -97,10 +97,9 @@ class HomeAssistantBluetoothManager(BluetoothManager):
matched_domains = self._integration_matcher.match_domains(service_info)
if self._debug:
_LOGGER.debug(
"%s: %s %s match: %s",
"%s: %s match: %s",
self._async_describe_source(service_info),
service_info.address,
service_info.advertisement,
service_info,
matched_domains,
)

2
homeassistant/components/bluetooth/manifest.json
View file

@ -20,6 +20,6 @@
"bluetooth-auto-recovery==1.4.2",
"bluetooth-data-tools==1.19.0",
"dbus-fast==2.21.1",
"habluetooth==2.8.1"
"habluetooth==3.0.1"
]
}

2
homeassistant/package_constraints.txt
View file

@ -28,7 +28,7 @@ dbus-fast==2.21.1
fnv-hash-fast==0.5.0
ha-av==10.1.1
ha-ffmpeg==3.2.0
habluetooth==2.8.1
habluetooth==3.0.1
hass-nabucasa==0.78.0
hassil==1.6.1
home-assistant-bluetooth==1.12.0

2
requirements_all.txt
View file

@ -1035,7 +1035,7 @@ ha-philipsjs==3.1.1
habitipy==0.2.0
# homeassistant.components.bluetooth
habluetooth==2.8.1
habluetooth==3.0.1
# homeassistant.components.cloud
hass-nabucasa==0.78.0

2
requirements_test_all.txt
View file

@ -849,7 +849,7 @@ ha-philipsjs==3.1.1
habitipy==0.2.0
# homeassistant.components.bluetooth
habluetooth==2.8.1
habluetooth==3.0.1
# homeassistant.components.cloud
hass-nabucasa==0.78.0

3
tests/components/airthings_ble/__init__.py
View file

@ -97,6 +97,7 @@ WAVE_SERVICE_INFO = BluetoothServiceInfoBleak(
),
connectable=True,
time=0,
tx_power=0,
)
VIEW_PLUS_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -141,6 +142,7 @@ VIEW_PLUS_SERVICE_INFO = BluetoothServiceInfoBleak(
),
connectable=True,
time=0,
tx_power=0,
)
UNKNOWN_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -161,6 +163,7 @@ UNKNOWN_SERVICE_INFO = BluetoothServiceInfoBleak(
),
connectable=True,
time=0,
tx_power=0,
)
WAVE_DEVICE_INFO = AirthingsDevice(

1
tests/components/aranet/__init__.py
View file

@ -31,6 +31,7 @@ def fake_service_info(name, service_uuid, manufacturer_data):
tx_power=-127,
platform_data=(),
),
tx_power=-127,
)

1
tests/components/bluetooth/__init__.py
View file

@ -155,6 +155,7 @@ def inject_advertisement_with_time_and_source_connectable(
advertisement=adv,
connectable=connectable,
time=time,
tx_power=adv.tx_power,
)
)

4
tests/components/bluetooth/test_diagnostics.py
View file

@ -335,6 +335,7 @@ async def test_diagnostics_macos(
"service_uuids": [],
"source": "local",
"time": ANY,
"tx_power": -127,
}
],
"connectable_history": [
@ -363,6 +364,7 @@ async def test_diagnostics_macos(
"service_uuids": [],
"source": "local",
"time": ANY,
"tx_power": -127,
}
],
"scanners": [
@ -526,6 +528,7 @@ async def test_diagnostics_remote_adapter(
"service_uuids": [],
"source": "esp32",
"time": ANY,
"tx_power": -127,
}
],
"connectable_history": [
@ -554,6 +557,7 @@ async def test_diagnostics_remote_adapter(
"service_uuids": [],
"source": "esp32",
"time": ANY,
"tx_power": -127,
}
],
"scanners": [

1
tests/components/bluetooth/test_passive_update_processor.py
View file

@ -465,6 +465,7 @@ async def test_unavailable_after_no_data(
device=MagicMock(),
advertisement=MagicMock(),
connectable=True,
tx_power=0,
)
inject_bluetooth_service_info_bleak(hass, service_info_at_time)

8
tests/components/bluetooth_le_tracker/test_device_tracker.py
View file

@ -92,6 +92,7 @@ async def test_do_not_see_device_if_time_not_updated(
advertisement=generate_advertisement_data(local_name="empty"),
time=0,
connectable=False,
tx_power=-127,
)
# Return with name with time = 0 for all the updates
mock_async_discovered_service_info.return_value = [device]
@ -157,6 +158,7 @@ async def test_see_device_if_time_updated(
advertisement=generate_advertisement_data(local_name="empty"),
time=0,
connectable=False,
tx_power=-127,
)
# Return with name with time = 0 initially
mock_async_discovered_service_info.return_value = [device]
@ -191,6 +193,7 @@ async def test_see_device_if_time_updated(
advertisement=generate_advertisement_data(local_name="empty"),
time=1,
connectable=False,
tx_power=-127,
)
# Return with name with time = 0 initially
mock_async_discovered_service_info.return_value = [device]
@ -237,6 +240,7 @@ async def test_preserve_new_tracked_device_name(
advertisement=generate_advertisement_data(local_name="empty"),
time=0,
connectable=False,
tx_power=-127,
)
# Return with name when seen first time
mock_async_discovered_service_info.return_value = [device]
@ -262,6 +266,7 @@ async def test_preserve_new_tracked_device_name(
advertisement=generate_advertisement_data(local_name="empty"),
time=0,
connectable=False,
tx_power=-127,
)
# Return with name when seen first time
mock_async_discovered_service_info.return_value = [device]
@ -305,6 +310,7 @@ async def test_tracking_battery_times_out(
advertisement=generate_advertisement_data(local_name="empty"),
time=0,
connectable=False,
tx_power=-127,
)
# Return with name when seen first time
mock_async_discovered_service_info.return_value = [device]
@ -373,6 +379,7 @@ async def test_tracking_battery_fails(
advertisement=generate_advertisement_data(local_name="empty"),
time=0,
connectable=False,
tx_power=-127,
)
# Return with name when seen first time
mock_async_discovered_service_info.return_value = [device]
@ -440,6 +447,7 @@ async def test_tracking_battery_successful(
advertisement=generate_advertisement_data(local_name="empty"),
time=0,
connectable=True,
tx_power=-127,
)
# Return with name when seen first time
mock_async_discovered_service_info.return_value = [device]

8
tests/components/bthome/__init__.py
View file

@ -18,6 +18,7 @@ TEMP_HUMI_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
TEMP_HUMI_ENCRYPTED_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -36,6 +37,7 @@ TEMP_HUMI_ENCRYPTED_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
PRST_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -54,6 +56,7 @@ PRST_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="prst"),
time=0,
connectable=False,
tx_power=-127,
)
INVALID_PAYLOAD = BluetoothServiceInfoBleak(
@ -70,6 +73,7 @@ INVALID_PAYLOAD = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
NOT_BTHOME_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -84,6 +88,7 @@ NOT_BTHOME_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
@ -103,6 +108,7 @@ def make_bthome_v1_adv(address: str, payload: bytes) -> BluetoothServiceInfoBlea
advertisement=generate_advertisement_data(local_name="Test Device"),
time=0,
connectable=False,
tx_power=-127,
)
@ -124,6 +130,7 @@ def make_encrypted_bthome_v1_adv(
advertisement=generate_advertisement_data(local_name="ATC 8F80A5"),
time=0,
connectable=False,
tx_power=-127,
)
@ -143,4 +150,5 @@ def make_bthome_v2_adv(address: str, payload: bytes) -> BluetoothServiceInfoBlea
advertisement=generate_advertisement_data(local_name="Test Device"),
time=0,
connectable=False,
tx_power=-127,
)

2
tests/components/dormakaba_dkey/__init__.py
View file

@ -18,6 +18,7 @@ DKEY_DISCOVERY_INFO = BluetoothServiceInfoBleak(
),
time=0,
connectable=True,
tx_power=-127,
)
@ -36,4 +37,5 @@ NOT_DKEY_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)

1
tests/components/eq3btsmart/conftest.py
View file

@ -38,4 +38,5 @@ def fake_service_info():
tx_power=-127,
platform_data=(),
),
tx_power=-127,
)

1
tests/components/fjaraskupan/__init__.py
View file

@ -16,4 +16,5 @@ COOKER_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)

1
tests/components/ibeacon/test_device_tracker.py
View file

@ -235,6 +235,7 @@ async def test_device_tracker_random_address_infrequent_changes(
connectable=False,
device=device,
advertisement=previous_service_info.advertisement,
tx_power=-127,
),
)
device = async_ble_device_from_address(hass, "AA:BB:CC:DD:EE:14", False)

2
tests/components/idasen_desk/__init__.py
View file

@ -20,6 +20,7 @@ IDASEN_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)
NOT_IDASEN_DISCOVERY_INFO = BluetoothServiceInfoBleak(
@ -34,6 +35,7 @@ NOT_IDASEN_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)

3
tests/components/improv_ble/__init__.py
View file

@ -21,6 +21,7 @@ IMPROV_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
),
time=0,
connectable=True,
tx_power=-127,
)
@ -39,6 +40,7 @@ PROVISIONED_IMPROV_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
),
time=0,
connectable=True,
tx_power=-127,
)
@ -57,4 +59,5 @@ NOT_IMPROV_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)

1
tests/components/keymitt_ble/__init__.py
View file

@ -46,6 +46,7 @@ SERVICE_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("aa:bb:cc:dd:ee:ff", "mibp"),
time=0,
connectable=True,
tx_power=-127,
)

2
tests/components/ld2410_ble/__init__.py
View file

@ -16,6 +16,7 @@ LD2410_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)
NOT_LD2410_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
@ -33,4 +34,5 @@ NOT_LD2410_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)

3
tests/components/led_ble/__init__.py
View file

@ -18,6 +18,7 @@ LED_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)
UNSUPPORTED_LED_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
@ -34,6 +35,7 @@ UNSUPPORTED_LED_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)
@ -52,4 +54,5 @@ NOT_LED_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)

2
tests/components/medcom_ble/__init__.py
View file

@ -75,6 +75,7 @@ MEDCOM_SERVICE_INFO = BluetoothServiceInfoBleak(
),
connectable=True,
time=0,
tx_power=-127,
)
UNKNOWN_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -95,6 +96,7 @@ UNKNOWN_SERVICE_INFO = BluetoothServiceInfoBleak(
),
connectable=True,
time=0,
tx_power=-127,
)
MEDCOM_DEVICE_INFO = MedcomBleDevice(

2
tests/components/melnor/conftest.py
View file

@ -35,6 +35,7 @@ FAKE_SERVICE_INFO_1 = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name=""),
time=0,
connectable=True,
tx_power=-127,
)
FAKE_SERVICE_INFO_2 = BluetoothServiceInfoBleak(
@ -51,6 +52,7 @@ FAKE_SERVICE_INFO_2 = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name=""),
time=0,
connectable=True,
tx_power=-127,
)

1
tests/components/motionblinds_ble/test_config_flow.py
View file

@ -39,6 +39,7 @@ BLIND_SERVICE_INFO = BluetoothServiceInfoBleak(
),
connectable=True,
time=0,
tx_power=-127,
)

1
tests/components/oralb/__init__.py
View file

@ -49,4 +49,5 @@ ORALB_IO_SERIES_6_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=True,
tx_power=-127,
)

1
tests/components/private_ble_device/__init__.py
View file

@ -63,6 +63,7 @@ async def async_inject_broadcast(
advertisement=generate_advertisement_data(local_name="Not it"),
time=broadcast_time or time.monotonic(),
connectable=False,
tx_power=-127,
),
)
await hass.async_block_till_done()

8
tests/components/switchbot/__init__.py
View file

@ -70,6 +70,7 @@ WOHAND_SERVICE_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("AA:BB:CC:DD:EE:FF", "WoHand"),
time=0,
connectable=True,
tx_power=-127,
)
@ -90,6 +91,7 @@ WOHAND_SERVICE_INFO_NOT_CONNECTABLE = BluetoothServiceInfoBleak(
device=generate_ble_device("aa:bb:cc:dd:ee:ff", "WoHand"),
time=0,
connectable=False,
tx_power=-127,
)
@ -110,6 +112,7 @@ WOHAND_ENCRYPTED_SERVICE_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("798A8547-2A3D-C609-55FF-73FA824B923B", "WoHand"),
time=0,
connectable=True,
tx_power=-127,
)
@ -130,6 +133,7 @@ WOHAND_SERVICE_ALT_ADDRESS_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("aa:bb:cc:dd:ee:ff", "WoHand"),
time=0,
connectable=True,
tx_power=-127,
)
WOCURTAIN_SERVICE_INFO = BluetoothServiceInfoBleak(
name="WoCurtain",
@ -148,6 +152,7 @@ WOCURTAIN_SERVICE_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("aa:bb:cc:dd:ee:ff", "WoCurtain"),
time=0,
connectable=True,
tx_power=-127,
)
WOSENSORTH_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -165,6 +170,7 @@ WOSENSORTH_SERVICE_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("aa:bb:cc:dd:ee:ff", "WoSensorTH"),
time=0,
connectable=False,
tx_power=-127,
)
@ -185,6 +191,7 @@ WOLOCK_SERVICE_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("aa:bb:cc:dd:ee:ff", "WoLock"),
time=0,
connectable=True,
tx_power=-127,
)
NOT_SWITCHBOT_INFO = BluetoothServiceInfoBleak(
@ -202,4 +209,5 @@ NOT_SWITCHBOT_INFO = BluetoothServiceInfoBleak(
device=generate_ble_device("aa:bb:cc:dd:ee:ff", "unknown"),
time=0,
connectable=True,
tx_power=-127,
)

10
tests/components/xiaomi_ble/__init__.py
View file

@ -16,6 +16,7 @@ NOT_SENSOR_PUSH_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
LYWSDCGQ_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -34,6 +35,7 @@ LYWSDCGQ_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
MMC_T201_1_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -52,6 +54,7 @@ MMC_T201_1_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
JTYJGD03MI_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -70,6 +73,7 @@ JTYJGD03MI_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
YLKG07YL_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -88,6 +92,7 @@ YLKG07YL_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
HHCCJCY10_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -102,6 +107,7 @@ HHCCJCY10_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
MISCALE_V1_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -118,6 +124,7 @@ MISCALE_V1_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
MISCALE_V2_SERVICE_INFO = BluetoothServiceInfoBleak(
@ -134,6 +141,7 @@ MISCALE_V2_SERVICE_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
MISSING_PAYLOAD_ENCRYPTED = BluetoothServiceInfoBleak(
@ -150,6 +158,7 @@ MISSING_PAYLOAD_ENCRYPTED = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(local_name="Not it"),
time=0,
connectable=False,
tx_power=-127,
)
@ -171,4 +180,5 @@ def make_advertisement(
advertisement=generate_advertisement_data(local_name="Test Device"),
time=0,
connectable=connectable,
tx_power=-127,
)

4
tests/components/yalexs_ble/__init__.py
View file

@ -19,6 +19,7 @@ YALE_ACCESS_LOCK_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)
@ -37,6 +38,7 @@ LOCK_DISCOVERY_INFO_UUID_ADDRESS = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)
OLD_FIRMWARE_LOCK_DISCOVERY_INFO = BluetoothServiceInfoBleak(
@ -54,6 +56,7 @@ OLD_FIRMWARE_LOCK_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)
@ -72,4 +75,5 @@ NOT_YALE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
advertisement=generate_advertisement_data(),
time=0,
connectable=True,
tx_power=-127,
)