From 8e846164a4ad1c69272c3438a92cd83b2abca0d1 Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 1 Jul 2021 14:05:55 -0400 Subject: [PATCH] Bump up ZHA dependencies (#52374) * Bump up ZHA dependencies * Fix broken tests * Update tests/components/zha/common.py Co-authored-by: Franck Nijhof Co-authored-by: Franck Nijhof --- homeassistant/components/zha/manifest.json | 4 ++-- requirements_all.txt | 4 ++-- requirements_test_all.txt | 4 ++-- tests/components/zha/common.py | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json index d1e79d1b67b..b366b73d6c8 100644 --- a/homeassistant/components/zha/manifest.json +++ b/homeassistant/components/zha/manifest.json @@ -7,10 +7,10 @@ "bellows==0.25.0", "pyserial==3.5", "pyserial-asyncio==0.5", - "zha-quirks==0.0.57", + "zha-quirks==0.0.58", "zigpy-cc==0.5.2", "zigpy-deconz==0.12.0", - "zigpy==0.34.0", + "zigpy==0.35.0", "zigpy-xbee==0.13.0", "zigpy-zigate==0.7.3", "zigpy-znp==0.5.1" diff --git a/requirements_all.txt b/requirements_all.txt index 9ed9b4181a6..0fe1fd626c5 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2431,7 +2431,7 @@ zengge==0.2 zeroconf==0.32.0 # homeassistant.components.zha -zha-quirks==0.0.57 +zha-quirks==0.0.58 # homeassistant.components.zhong_hong zhong_hong_hvac==1.0.9 @@ -2455,7 +2455,7 @@ zigpy-zigate==0.7.3 zigpy-znp==0.5.1 # homeassistant.components.zha -zigpy==0.34.0 +zigpy==0.35.0 # homeassistant.components.zoneminder zm-py==0.5.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index bf8d9fd8138..df8fd6591e8 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1334,7 +1334,7 @@ zeep[async]==4.0.0 zeroconf==0.32.0 # homeassistant.components.zha -zha-quirks==0.0.57 +zha-quirks==0.0.58 # homeassistant.components.zha zigpy-cc==0.5.2 @@ -1352,7 +1352,7 @@ zigpy-zigate==0.7.3 zigpy-znp==0.5.1 # homeassistant.components.zha -zigpy==0.34.0 +zigpy==0.35.0 # homeassistant.components.zwave_js zwave-js-server-python==0.27.0 diff --git a/tests/components/zha/common.py b/tests/components/zha/common.py index 45caed95ae6..eb65cc4fd2e 100644 --- a/tests/components/zha/common.py +++ b/tests/components/zha/common.py @@ -40,8 +40,9 @@ class FakeEndpoint: if _patch_cluster: patch_cluster(cluster) self.in_clusters[cluster_id] = cluster - if hasattr(cluster, "ep_attribute"): - setattr(self, cluster.ep_attribute, cluster) + ep_attribute = cluster.ep_attribute + if ep_attribute: + setattr(self, ep_attribute, cluster) def add_output_cluster(self, cluster_id, _patch_cluster=True): """Add an output cluster."""