Skip to content

Commit a73b278

Browse files
authored
Switch to importlib.metadata from the deprecated pkg_resources module (#207)
1 parent 9b959dc commit a73b278

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

zigpy_znp/api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import itertools
99
import contextlib
1010
import dataclasses
11+
import importlib.metadata
1112
from collections import Counter, defaultdict
1213

1314
import zigpy.state
1415
import async_timeout
15-
import pkg_resources
1616
import zigpy.zdo.types as zdo_t
1717
import zigpy.exceptions
1818
from zigpy.exceptions import NetworkNotFormed
@@ -136,10 +136,9 @@ async def _load_network_info(self, *, load_devices=False):
136136
)
137137

138138
version = await self.request(c.SYS.Version.Req())
139-
package_version = pkg_resources.get_distribution("zigpy_znp").version
140139

141140
network_info = zigpy.state.NetworkInfo(
142-
source=f"zigpy-znp@{package_version}",
141+
source=f"zigpy-znp@{importlib.metadata.version('zigpy-znp')}",
143142
extended_pan_id=nib.extendedPANID,
144143
pan_id=nib.nwkPanId,
145144
nwk_update_id=nib.nwkUpdateId,

zigpy_znp/tools/network_backup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import asyncio
66
import logging
77
import datetime
8+
import importlib.metadata
89

910
import zigpy.state
10-
import pkg_resources
1111

1212
import zigpy_znp.types as t
1313
from zigpy_znp.api import ZNP
@@ -84,8 +84,7 @@ async def backup_network(znp: ZNP) -> t.JSONType:
8484

8585
now = datetime.datetime.now().astimezone()
8686

87-
package_version = pkg_resources.get_distribution("zigpy_znp").version
88-
obj["metadata"]["source"] = f"zigpy-znp@{package_version}"
87+
obj["metadata"]["source"] = f"zigpy-znp@{importlib.metadata.version('zigpy-znp')}"
8988
obj["metadata"]["internal"] = {
9089
"creation_time": now.isoformat(timespec="seconds"),
9190
"zstack": {

0 commit comments

Comments
 (0)