Skip to content

Commit 5f72d98

Browse files
puddlyAdminiuga
andauthored
Merge master into dev (#224)
* 0.7.0 version bump. * 0.8.0 version bump. * 0.9.0 Version bump. * 0.9.1 Version bump * 0.9.2 Version bump * 0.10.0 version bump. * 0.11.0 Version bump * 0.11.1 Version bump * 0.12.0 Version bump * 0.12.1 Version bump * 0.13.0 Version bump * 0.14.0 version bump * Bump version to 0.15.0 * 0.16.0 Release * 0.17.0 Release * 0.18.0 version bump * Bump version to 0.18.1 * 0.19.0 version bump * Bump version to 0.19.1 * Bump version to 0.19.2 * 0.20.0 version bump * 0.21.0 release * Remove `__version__` * Fix unit tests --------- Co-authored-by: Alexei Chetroi <lexoid@gmail.com> Co-authored-by: Alexei Chetroi <Alexei.Chetroi@outlook.com>
1 parent 322520e commit 5f72d98

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

tests/test_network_state.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"""Test `load_network_info` and `write_network_info` methods."""
22

3+
import importlib.metadata
4+
35
import pytest
46
from zigpy.exceptions import NetworkNotFormed
57
import zigpy.state as app_state
@@ -57,7 +59,7 @@ def network_info(node_info):
5759
children=[],
5860
nwk_addresses={},
5961
stack_specific={},
60-
source=f"zigpy-deconz@{zigpy_deconz.__version__}",
62+
source=f"zigpy-deconz@{importlib.metadata.version('zigpy-deconz')}",
6163
metadata={
6264
"deconz": {
6365
"version": 0,

zigpy_deconz/__init__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
11
"""Init file for zigpy_deconz."""
2-
3-
# coding: utf-8
4-
MAJOR_VERSION = 0
5-
MINOR_VERSION = 21
6-
PATCH_VERSION = "0.dev0"
7-
__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
8-
__version__ = f"{__short_version__}.{PATCH_VERSION}"

zigpy_deconz/zigbee/application.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import annotations
44

55
import asyncio
6+
import importlib.metadata
67
import logging
78
import re
89
from typing import Any
@@ -266,7 +267,9 @@ async def load_network_info(self, *, load_devices=False):
266267
network_info = self.state.network_info
267268
node_info = self.state.node_info
268269

269-
network_info.source = f"zigpy-deconz@{zigpy_deconz.__version__}"
270+
network_info.source = (
271+
f"zigpy-deconz@{importlib.metadata.version('zigpy-deconz')}"
272+
)
270273
network_info.metadata = {
271274
"deconz": {
272275
"version": self.version,

0 commit comments

Comments
 (0)