jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump Matter Server to 3.6.3 (#95519)

Browse Source
This commit is contained in:
Marcel van der Veldt 2023-06-29 15:28:34 +02:00 committed by GitHub
parent 9d7007df63
commit e9d8fff0dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/components/matter/adapter.py
View File

@ -96,20 +96,24 @@ class MatterAdapter:
) )
self.config_entry.async_on_unload( self.config_entry.async_on_unload(
self.matter_client.subscribe( self.matter_client.subscribe_events(
endpoint_added_callback, EventType.ENDPOINT_ADDED endpoint_added_callback, EventType.ENDPOINT_ADDED
) )
) )
self.config_entry.async_on_unload( self.config_entry.async_on_unload(
self.matter_client.subscribe( self.matter_client.subscribe_events(
endpoint_removed_callback, EventType.ENDPOINT_REMOVED endpoint_removed_callback, EventType.ENDPOINT_REMOVED
) )
) )
self.config_entry.async_on_unload( self.config_entry.async_on_unload(
self.matter_client.subscribe(node_removed_callback, EventType.NODE_REMOVED) self.matter_client.subscribe_events(
node_removed_callback, EventType.NODE_REMOVED
)
) )
self.config_entry.async_on_unload( self.config_entry.async_on_unload(
self.matter_client.subscribe(node_added_callback, EventType.NODE_ADDED) self.matter_client.subscribe_events(
node_added_callback, EventType.NODE_ADDED
)
) )
def _setup_node(self, node: MatterNode) -> None: def _setup_node(self, node: MatterNode) -> None:

4
homeassistant/components/matter/entity.py
View File

@ -81,7 +81,7 @@ class MatterEntity(Entity):
self._attributes_map[attr_cls] = attr_path self._attributes_map[attr_cls] = attr_path
sub_paths.append(attr_path) sub_paths.append(attr_path)
self._unsubscribes.append( self._unsubscribes.append(
self.matter_client.subscribe( self.matter_client.subscribe_events(
callback=self._on_matter_event, callback=self._on_matter_event,
event_filter=EventType.ATTRIBUTE_UPDATED, event_filter=EventType.ATTRIBUTE_UPDATED,
node_filter=self._endpoint.node.node_id, node_filter=self._endpoint.node.node_id,
@ -93,7 +93,7 @@ class MatterEntity(Entity):
) )
# subscribe to node (availability changes) # subscribe to node (availability changes)
self._unsubscribes.append( self._unsubscribes.append(
self.matter_client.subscribe( self.matter_client.subscribe_events(
callback=self._on_matter_event, callback=self._on_matter_event,
event_filter=EventType.NODE_UPDATED, event_filter=EventType.NODE_UPDATED,
node_filter=self._endpoint.node.node_id, node_filter=self._endpoint.node.node_id,

2
homeassistant/components/matter/manifest.json
View File

@ -6,5 +6,5 @@
"dependencies": ["websocket_api"], "dependencies": ["websocket_api"],
"documentation": "https://www.home-assistant.io/integrations/matter", "documentation": "https://www.home-assistant.io/integrations/matter",
"iot_class": "local_push", "iot_class": "local_push",
"requirements": ["python-matter-server==3.6.0"] "requirements": ["python-matter-server==3.6.3"]
} }

2
requirements_all.txt
View File

@ -2105,7 +2105,7 @@ python-kasa==0.5.1
# python-lirc==1.2.3 # python-lirc==1.2.3
# homeassistant.components.matter # homeassistant.components.matter
python-matter-server==3.6.0 python-matter-server==3.6.3
# homeassistant.components.xiaomi_miio # homeassistant.components.xiaomi_miio
python-miio==0.5.12 python-miio==0.5.12

2
requirements_test_all.txt
View File

@ -1543,7 +1543,7 @@ python-juicenet==1.1.0
python-kasa==0.5.1 python-kasa==0.5.1
# homeassistant.components.matter # homeassistant.components.matter
python-matter-server==3.6.0 python-matter-server==3.6.3
# homeassistant.components.xiaomi_miio # homeassistant.components.xiaomi_miio
python-miio==0.5.12 python-miio==0.5.12

2
tests/components/matter/common.py
View File

@ -71,6 +71,6 @@ async def trigger_subscription_callback(
data: Any = None, data: Any = None,
) -> None: ) -> None:
"""Trigger a subscription callback.""" """Trigger a subscription callback."""
callback = client.subscribe.call_args.kwargs["callback"] callback = client.subscribe_events.call_args.kwargs["callback"]
callback(event, data) callback(event, data)
await hass.async_block_till_done() await hass.async_block_till_done()

6
tests/components/matter/test_adapter.py
View File

@ -136,10 +136,10 @@ async def test_node_added_subscription(
integration: MagicMock, integration: MagicMock,
) -> None: ) -> None:
"""Test subscription to new devices work.""" """Test subscription to new devices work."""
assert matter_client.subscribe.call_count == 4 assert matter_client.subscribe_events.call_count == 4
assert matter_client.subscribe.call_args[0][1] == EventType.NODE_ADDED assert matter_client.subscribe_events.call_args[0][1] == EventType.NODE_ADDED
node_added_callback = matter_client.subscribe.call_args[0][0] node_added_callback = matter_client.subscribe_events.call_args[0][0]
node_data = load_and_parse_node_fixture("onoff-light") node_data = load_and_parse_node_fixture("onoff-light")
node = MatterNode( node = MatterNode(
dataclass_from_dict( dataclass_from_dict(