Merge master into dev

tests/test_network_state.py

@@ -1,5 +1,7 @@
 """Test `load_network_info` and `write_network_info` methods."""
 
+import importlib.metadata
+
 import pytest
 from zigpy.exceptions import NetworkNotFormed
 import zigpy.state as app_state
@@ -57,7 +59,7 @@ def network_info(node_info):
         children=[],
         nwk_addresses={},
         stack_specific={},
-        source=f"zigpy-deconz@{zigpy_deconz.__version__}",
+        source=f"zigpy-deconz@{importlib.metadata.version('zigpy-deconz')}",
         metadata={
             "deconz": {
                 "version": 0,

zigpy_deconz/__init__.py

@@ -1,8 +1 @@
 """Init file for zigpy_deconz."""
-
-# coding: utf-8
-MAJOR_VERSION = 0
-MINOR_VERSION = 21
-PATCH_VERSION = "0.dev0"
-__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
-__version__ = f"{__short_version__}.{PATCH_VERSION}"

zigpy_deconz/zigbee/application.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import importlib.metadata
 import logging
 import re
 from typing import Any
@@ -266,7 +267,9 @@ async def load_network_info(self, *, load_devices=False):
         network_info = self.state.network_info
         node_info = self.state.node_info
 
-        network_info.source = f"zigpy-deconz@{zigpy_deconz.__version__}"
+        network_info.source = (
+            f"zigpy-deconz@{importlib.metadata.version('zigpy-deconz')}"
+        )
         network_info.metadata = {
             "deconz": {
                 "version": self.version,