diff --git a/homeassistant/components/zha/diagnostics.py b/homeassistant/components/zha/diagnostics.py index 8b025f6eec873..2e0653b47e19e 100644 --- a/homeassistant/components/zha/diagnostics.py +++ b/homeassistant/components/zha/diagnostics.py @@ -2,18 +2,12 @@ from __future__ import annotations import dataclasses +from importlib.metadata import version from typing import Any -import bellows -import pkg_resources -import zigpy from zigpy.config import CONF_NWK_EXTENDED_PAN_ID from zigpy.profiles import PROFILES from zigpy.zcl import Cluster -import zigpy_deconz -import zigpy_xbee -import zigpy_zigate -import zigpy_znp from homeassistant.components.diagnostics.util import async_redact_data from homeassistant.config_entries import ConfigEntry @@ -79,13 +73,13 @@ async def async_get_config_entry_diagnostics( "config_entry": config_entry.as_dict(), "application_state": shallow_asdict(gateway.application_controller.state), "versions": { - "bellows": bellows.__version__, - "zigpy": zigpy.__version__, - "zigpy_deconz": zigpy_deconz.__version__, - "zigpy_xbee": zigpy_xbee.__version__, - "zigpy_znp": zigpy_znp.__version__, - "zigpy_zigate": zigpy_zigate.__version__, - "zhaquirks": pkg_resources.get_distribution("zha-quirks").version, + "bellows": version("bellows"), + "zigpy": version("zigpy"), + "zigpy_deconz": version("zigpy-deconz"), + "zigpy_xbee": version("zigpy-xbee"), + "zigpy_znp": version("zigpy_znp"), + "zigpy_zigate": version("zigpy-zigate"), + "zhaquirks": version("zha-quirks"), }, }, KEYS_TO_REDACT, diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json index 1e0d8999d3002..44f88aa7339b1 100644 --- a/homeassistant/components/zha/manifest.json +++ b/homeassistant/components/zha/manifest.json @@ -20,15 +20,15 @@ "zigpy_znp" ], "requirements": [ - "bellows==0.34.7", + "bellows==0.34.9", "pyserial==3.5", "pyserial-asyncio==0.6", "zha-quirks==0.0.93", "zigpy-deconz==0.19.2", - "zigpy==0.53.0", + "zigpy==0.53.2", "zigpy-xbee==0.16.2", "zigpy-zigate==0.10.3", - "zigpy-znp==0.9.2" + "zigpy-znp==0.9.3" ], "usb": [ { diff --git a/requirements_all.txt b/requirements_all.txt index 91b1fb85f0a3a..61824576d5ea9 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -422,7 +422,7 @@ beautifulsoup4==4.11.1 # beewi_smartclim==0.0.10 # homeassistant.components.zha -bellows==0.34.7 +bellows==0.34.9 # homeassistant.components.bmw_connected_drive bimmer_connected==0.12.1 @@ -2724,10 +2724,10 @@ zigpy-xbee==0.16.2 zigpy-zigate==0.10.3 # homeassistant.components.zha -zigpy-znp==0.9.2 +zigpy-znp==0.9.3 # homeassistant.components.zha -zigpy==0.53.0 +zigpy==0.53.2 # homeassistant.components.zoneminder zm-py==0.5.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 243c488d3f9b0..379e0fd6c93f2 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -352,7 +352,7 @@ base36==0.1.1 beautifulsoup4==4.11.1 # homeassistant.components.zha -bellows==0.34.7 +bellows==0.34.9 # homeassistant.components.bmw_connected_drive bimmer_connected==0.12.1 @@ -1937,10 +1937,10 @@ zigpy-xbee==0.16.2 zigpy-zigate==0.10.3 # homeassistant.components.zha -zigpy-znp==0.9.2 +zigpy-znp==0.9.3 # homeassistant.components.zha -zigpy==0.53.0 +zigpy==0.53.2 # homeassistant.components.zwave_js zwave-js-server-python==0.46.0