Bump bluetooth-adapters to 2.1.0 and habluetooth to 5.3.0 (#151465)

This commit is contained in:
J. Nick Koston
2025-08-31 17:13:03 -05:00
committed by GitHub
parent 4420776977
commit c73289aed9
7 changed files with 16 additions and 9 deletions

View File

@@ -385,10 +385,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
f"Bluetooth adapter {adapter} with address {address} not found" f"Bluetooth adapter {adapter} with address {address} not found"
) )
passive = entry.options.get(CONF_PASSIVE) passive = entry.options.get(CONF_PASSIVE)
adapters = await manager.async_get_bluetooth_adapters()
mode = BluetoothScanningMode.PASSIVE if passive else BluetoothScanningMode.ACTIVE mode = BluetoothScanningMode.PASSIVE if passive else BluetoothScanningMode.ACTIVE
scanner = HaScanner(mode, adapter, address) scanner = HaScanner(mode, adapter, address)
scanner.async_setup() scanner.async_setup()
adapters = await manager.async_get_bluetooth_adapters()
details = adapters[adapter] details = adapters[adapter]
if entry.title == address: if entry.title == address:
hass.config_entries.async_update_entry( hass.config_entries.async_update_entry(

View File

@@ -17,10 +17,10 @@
"requirements": [ "requirements": [
"bleak==1.0.1", "bleak==1.0.1",
"bleak-retry-connector==4.4.3", "bleak-retry-connector==4.4.3",
"bluetooth-adapters==2.0.0", "bluetooth-adapters==2.1.0",
"bluetooth-auto-recovery==1.5.2", "bluetooth-auto-recovery==1.5.2",
"bluetooth-data-tools==1.28.2", "bluetooth-data-tools==1.28.2",
"dbus-fast==2.44.3", "dbus-fast==2.44.3",
"habluetooth==5.2.1" "habluetooth==5.3.0"
] ]
} }

View File

@@ -22,7 +22,7 @@ awesomeversion==25.5.0
bcrypt==4.3.0 bcrypt==4.3.0
bleak-retry-connector==4.4.3 bleak-retry-connector==4.4.3
bleak==1.0.1 bleak==1.0.1
bluetooth-adapters==2.0.0 bluetooth-adapters==2.1.0
bluetooth-auto-recovery==1.5.2 bluetooth-auto-recovery==1.5.2
bluetooth-data-tools==1.28.2 bluetooth-data-tools==1.28.2
cached-ipaddress==0.10.0 cached-ipaddress==0.10.0
@@ -34,7 +34,7 @@ dbus-fast==2.44.3
fnv-hash-fast==1.5.0 fnv-hash-fast==1.5.0
go2rtc-client==0.2.1 go2rtc-client==0.2.1
ha-ffmpeg==3.2.2 ha-ffmpeg==3.2.2
habluetooth==5.2.1 habluetooth==5.3.0
hass-nabucasa==1.0.0 hass-nabucasa==1.0.0
hassil==3.2.0 hassil==3.2.0
home-assistant-bluetooth==1.13.1 home-assistant-bluetooth==1.13.1

4
requirements_all.txt generated
View File

@@ -652,7 +652,7 @@ bluemaestro-ble==0.4.1
# bluepy==1.3.0 # bluepy==1.3.0
# homeassistant.components.bluetooth # homeassistant.components.bluetooth
bluetooth-adapters==2.0.0 bluetooth-adapters==2.1.0
# homeassistant.components.bluetooth # homeassistant.components.bluetooth
bluetooth-auto-recovery==1.5.2 bluetooth-auto-recovery==1.5.2
@@ -1133,7 +1133,7 @@ ha-silabs-firmware-client==0.2.0
habiticalib==0.4.4 habiticalib==0.4.4
# homeassistant.components.bluetooth # homeassistant.components.bluetooth
habluetooth==5.2.1 habluetooth==5.3.0
# homeassistant.components.cloud # homeassistant.components.cloud
hass-nabucasa==1.0.0 hass-nabucasa==1.0.0

View File

@@ -583,7 +583,7 @@ bluemaestro-ble==0.4.1
# bluepy==1.3.0 # bluepy==1.3.0
# homeassistant.components.bluetooth # homeassistant.components.bluetooth
bluetooth-adapters==2.0.0 bluetooth-adapters==2.1.0
# homeassistant.components.bluetooth # homeassistant.components.bluetooth
bluetooth-auto-recovery==1.5.2 bluetooth-auto-recovery==1.5.2
@@ -994,7 +994,7 @@ ha-silabs-firmware-client==0.2.0
habiticalib==0.4.4 habiticalib==0.4.4
# homeassistant.components.bluetooth # homeassistant.components.bluetooth
habluetooth==5.2.1 habluetooth==5.3.0
# homeassistant.components.cloud # homeassistant.components.cloud
hass-nabucasa==1.0.0 hass-nabucasa==1.0.0

View File

@@ -297,6 +297,7 @@ async def test_diagnostics_macos(
assert diag == { assert diag == {
"adapters": { "adapters": {
"Core Bluetooth": { "Core Bluetooth": {
"adapter_type": None,
"address": "00:00:00:00:00:00", "address": "00:00:00:00:00:00",
"manufacturer": "Apple", "manufacturer": "Apple",
"passive_scan": False, "passive_scan": False,
@@ -317,6 +318,7 @@ async def test_diagnostics_macos(
}, },
"adapters": { "adapters": {
"Core Bluetooth": { "Core Bluetooth": {
"adapter_type": None,
"address": "00:00:00:00:00:00", "address": "00:00:00:00:00:00",
"manufacturer": "Apple", "manufacturer": "Apple",
"passive_scan": False, "passive_scan": False,

View File

@@ -332,6 +332,7 @@ async def test_subscribe_scanner_details(
"connectable": False, "connectable": False,
"name": "hci0 (00:00:00:00:00:01)", "name": "hci0 (00:00:00:00:00:01)",
"source": "00:00:00:00:00:01", "source": "00:00:00:00:00:01",
"scanner_type": "unknown",
} }
] ]
} }
@@ -349,6 +350,7 @@ async def test_subscribe_scanner_details(
"connectable": False, "connectable": False,
"name": "hci3 (AA:BB:CC:DD:EE:33)", "name": "hci3 (AA:BB:CC:DD:EE:33)",
"source": "AA:BB:CC:DD:EE:33", "source": "AA:BB:CC:DD:EE:33",
"scanner_type": "unknown",
} }
] ]
} }
@@ -362,6 +364,7 @@ async def test_subscribe_scanner_details(
"connectable": False, "connectable": False,
"name": "hci3 (AA:BB:CC:DD:EE:33)", "name": "hci3 (AA:BB:CC:DD:EE:33)",
"source": "AA:BB:CC:DD:EE:33", "source": "AA:BB:CC:DD:EE:33",
"scanner_type": "unknown",
} }
] ]
} }
@@ -399,6 +402,7 @@ async def test_subscribe_scanner_details_specific_scanner(
"connectable": False, "connectable": False,
"name": "hci3 (AA:BB:CC:DD:EE:33)", "name": "hci3 (AA:BB:CC:DD:EE:33)",
"source": "AA:BB:CC:DD:EE:33", "source": "AA:BB:CC:DD:EE:33",
"scanner_type": "unknown",
} }
] ]
} }
@@ -412,6 +416,7 @@ async def test_subscribe_scanner_details_specific_scanner(
"connectable": False, "connectable": False,
"name": "hci3 (AA:BB:CC:DD:EE:33)", "name": "hci3 (AA:BB:CC:DD:EE:33)",
"source": "AA:BB:CC:DD:EE:33", "source": "AA:BB:CC:DD:EE:33",
"scanner_type": "unknown",
} }
] ]
} }