From 3389ee4b80394e8469a9a338d3de1772d63e584d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 13 Apr 2025 21:37:42 -1000
Subject: [PATCH] Bump inkbird-ble to 0.13.0 (#142885)

* Bump inkbird-ble to 0.12.0

changelog: https://github.com/Bluetooth-Devices/inkbird-ble/compare/v0.11.0...v0.12.0

* map discovery as well

* fix merge

* fix merge error

* bump again for more cleanups

* fix tests
---
 .../components/inkbird/manifest.json          |  2 +-
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 tests/components/inkbird/__init__.py          | 48 ++++++++++++++++---
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/inkbird/manifest.json b/homeassistant/components/inkbird/manifest.json
index b3dbb7742ff..2e23663f5ff 100644
--- a/homeassistant/components/inkbird/manifest.json
+++ b/homeassistant/components/inkbird/manifest.json
@@ -40,5 +40,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/inkbird",
   "iot_class": "local_push",
-  "requirements": ["inkbird-ble==0.11.0"]
+  "requirements": ["inkbird-ble==0.13.0"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index bfb00efcf2e..5b902ce7ad8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1235,7 +1235,7 @@ influxdb-client==1.24.0
 influxdb==5.3.1
 
 # homeassistant.components.inkbird
-inkbird-ble==0.11.0
+inkbird-ble==0.13.0
 
 # homeassistant.components.insteon
 insteon-frontend-home-assistant==0.5.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 46e70361923..5d3ce9687f3 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1050,7 +1050,7 @@ influxdb-client==1.24.0
 influxdb==5.3.1
 
 # homeassistant.components.inkbird
-inkbird-ble==0.11.0
+inkbird-ble==0.13.0
 
 # homeassistant.components.insteon
 insteon-frontend-home-assistant==0.5.0
diff --git a/tests/components/inkbird/__init__.py b/tests/components/inkbird/__init__.py
index e285e1cbf2d..63acff7a150 100644
--- a/tests/components/inkbird/__init__.py
+++ b/tests/components/inkbird/__init__.py
@@ -1,8 +1,44 @@
 """Tests for the INKBIRD integration."""
 
-from homeassistant.helpers.service_info.bluetooth import BluetoothServiceInfo
+from uuid import UUID
 
-NOT_INKBIRD_SERVICE_INFO = BluetoothServiceInfo(
+from bleak.backends.device import BLEDevice
+
+from homeassistant.components.bluetooth import MONOTONIC_TIME, BluetoothServiceInfoBleak
+
+
+def _make_bluetooth_service_info(
+    name: str,
+    manufacturer_data: dict[int, bytes],
+    service_uuids: list[str],
+    address: str,
+    rssi: int,
+    service_data: dict[UUID, bytes],
+    source: str,
+    tx_power: int = 0,
+) -> BluetoothServiceInfoBleak:
+    return BluetoothServiceInfoBleak(
+        name=name,
+        manufacturer_data=manufacturer_data,
+        service_uuids=service_uuids,
+        address=address,
+        rssi=rssi,
+        service_data=service_data,
+        source=source,
+        device=BLEDevice(
+            name=name,
+            address=address,
+            details={},
+            rssi=rssi,
+        ),
+        time=MONOTONIC_TIME(),
+        advertisement=None,
+        connectable=True,
+        tx_power=tx_power,
+    )
+
+
+NOT_INKBIRD_SERVICE_INFO = _make_bluetooth_service_info(
     name="Not it",
     address="61DE521B-F0BF-9F44-64D4-75BBE1738105",
     rssi=-63,
@@ -12,7 +48,7 @@ NOT_INKBIRD_SERVICE_INFO = BluetoothServiceInfo(
     source="local",
 )
 
-SPS_SERVICE_INFO = BluetoothServiceInfo(
+SPS_SERVICE_INFO = _make_bluetooth_service_info(
     name="sps",
     address="61DE521B-F0BF-9F44-64D4-75BBE1738105",
     rssi=-63,
@@ -23,7 +59,7 @@ SPS_SERVICE_INFO = BluetoothServiceInfo(
 )
 
 
-SPS_PASSIVE_SERVICE_INFO = BluetoothServiceInfo(
+SPS_PASSIVE_SERVICE_INFO = _make_bluetooth_service_info(
     name="sps",
     address="AA:BB:CC:DD:EE:FF",
     rssi=-63,
@@ -34,7 +70,7 @@ SPS_PASSIVE_SERVICE_INFO = BluetoothServiceInfo(
 )
 
 
-SPS_WITH_CORRUPT_NAME_SERVICE_INFO = BluetoothServiceInfo(
+SPS_WITH_CORRUPT_NAME_SERVICE_INFO = _make_bluetooth_service_info(
     name="XXXXcorruptXXXX",
     address="AA:BB:CC:DD:EE:FF",
     rssi=-63,
@@ -45,7 +81,7 @@ SPS_WITH_CORRUPT_NAME_SERVICE_INFO = BluetoothServiceInfo(
 )
 
 
-IBBQ_SERVICE_INFO = BluetoothServiceInfo(
+IBBQ_SERVICE_INFO = _make_bluetooth_service_info(
     name="iBBQ",
     address="4125DDBA-2774-4851-9889-6AADDD4CAC3D",
     rssi=-56,