Bump HAP-python to 4.7.0 (#94812)

This commit is contained in:
J. Nick Koston 2023-06-20 22:06:26 +01:00 committed by Franck Nijhof
parent f33d671a5d
commit e1751647f4
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
5 changed files with 17 additions and 14 deletions

View File

@ -626,10 +626,10 @@ class HomeDriver(AccessoryDriver): # type: ignore[misc]
@pyhap_callback # type: ignore[misc] @pyhap_callback # type: ignore[misc]
def pair( def pair(
self, client_uuid: UUID, client_public: str, client_permissions: int self, client_username_bytes: bytes, client_public: str, client_permissions: int
) -> bool: ) -> bool:
"""Override super function to dismiss setup message if paired.""" """Override super function to dismiss setup message if paired."""
success = super().pair(client_uuid, client_public, client_permissions) success = super().pair(client_username_bytes, client_public, client_permissions)
if success: if success:
async_dismiss_setup_message(self.hass, self._entry_id) async_dismiss_setup_message(self.hass, self._entry_id)
return cast(bool, success) return cast(bool, success)

View File

@ -9,7 +9,7 @@
"iot_class": "local_push", "iot_class": "local_push",
"loggers": ["pyhap"], "loggers": ["pyhap"],
"requirements": [ "requirements": [
"HAP-python==4.6.0", "HAP-python==4.7.0",
"fnv-hash-fast==0.3.1", "fnv-hash-fast==0.3.1",
"PyQRCode==1.2.1", "PyQRCode==1.2.1",
"base36==0.1.1" "base36==0.1.1"

View File

@ -11,7 +11,7 @@ AIOAladdinConnect==0.1.56
Adax-local==0.1.5 Adax-local==0.1.5
# homeassistant.components.homekit # homeassistant.components.homekit
HAP-python==4.6.0 HAP-python==4.7.0
# homeassistant.components.mastodon # homeassistant.components.mastodon
Mastodon.py==1.5.1 Mastodon.py==1.5.1

View File

@ -13,7 +13,7 @@ AIOAladdinConnect==0.1.56
Adax-local==0.1.5 Adax-local==0.1.5
# homeassistant.components.homekit # homeassistant.components.homekit
HAP-python==4.6.0 HAP-python==4.7.0
# homeassistant.components.flick_electric # homeassistant.components.flick_electric
PyFlick==0.0.2 PyFlick==0.0.2

View File

@ -3,6 +3,7 @@ from __future__ import annotations
import asyncio import asyncio
from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
from uuid import uuid1
from pyhap.accessory import Accessory from pyhap.accessory import Accessory
from pyhap.const import CATEGORY_CAMERA, CATEGORY_TELEVISION from pyhap.const import CATEGORY_CAMERA, CATEGORY_TELEVISION
@ -868,11 +869,11 @@ async def test_homekit_unpair(
homekit.driver.aio_stop_event = MagicMock() homekit.driver.aio_stop_event = MagicMock()
state = homekit.driver.state state = homekit.driver.state
state.add_paired_client("client1", "any", b"1") state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"1")
state.add_paired_client("client2", "any", b"0") state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"0")
state.add_paired_client("client3", "any", b"1") state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"1")
state.add_paired_client("client4", "any", b"0") state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"0")
state.add_paired_client("client5", "any", b"0") state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"0")
formatted_mac = dr.format_mac(state.mac) formatted_mac = dr.format_mac(state.mac)
hk_bridge_dev = device_registry.async_get_device( hk_bridge_dev = device_registry.async_get_device(
@ -917,7 +918,8 @@ async def test_homekit_unpair_missing_device_id(
homekit.driver.aio_stop_event = MagicMock() homekit.driver.aio_stop_event = MagicMock()
state = homekit.driver.state state = homekit.driver.state
state.add_paired_client("client1", "any", b"1") client_1 = str(uuid1()).encode("utf-8")
state.add_paired_client(client_1, "any", b"1")
with pytest.raises(HomeAssistantError): with pytest.raises(HomeAssistantError):
await hass.services.async_call( await hass.services.async_call(
DOMAIN, DOMAIN,
@ -926,7 +928,7 @@ async def test_homekit_unpair_missing_device_id(
blocking=True, blocking=True,
) )
await hass.async_block_till_done() await hass.async_block_till_done()
state.paired_clients = {"client1": "any"} state.paired_clients = {client_1.decode("utf-8"): "any"}
homekit.status = STATUS_STOPPED homekit.status = STATUS_STOPPED
@ -967,7 +969,8 @@ async def test_homekit_unpair_not_homekit_device(
) )
state = homekit.driver.state state = homekit.driver.state
state.add_paired_client("client1", "any", b"1") client_1 = str(uuid1()).encode("utf-8")
state.add_paired_client(client_1, "any", b"1")
with pytest.raises(HomeAssistantError): with pytest.raises(HomeAssistantError):
await hass.services.async_call( await hass.services.async_call(
DOMAIN, DOMAIN,
@ -976,7 +979,7 @@ async def test_homekit_unpair_not_homekit_device(
blocking=True, blocking=True,
) )
await hass.async_block_till_done() await hass.async_block_till_done()
state.paired_clients = {"client1": "any"} state.paired_clients = {client_1.decode("utf-8"): "any"}
homekit.status = STATUS_STOPPED homekit.status = STATUS_STOPPED