switch from pkg_resources to importlib_metadata

This commit is contained in:
James Woglom
2026-03-05 02:54:45 -05:00
parent 0733531f67
commit 4f2affe70f
5 changed files with 485 additions and 410 deletions
+1
View File
@@ -22,6 +22,7 @@ cryptography = "*"
dataclasses-json = "*" dataclasses-json = "*"
cffi = ">=1.15.1" cffi = ">=1.15.1"
typing-extensions = "*" typing-extensions = "*"
importlib-metadata = {version = "*", markers = "python_version < '3.8'"}
setuptools = "*" setuptools = "*"
[scripts] [scripts]
Generated
+470 -402
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -35,6 +35,7 @@ install_requires =
dataclasses-json dataclasses-json
cffi cffi
typing-extensions typing-extensions
importlib-metadata; python_version < "3.8"
[options.packages.find] [options.packages.find]
where = . where = .
+5 -4
View File
@@ -3,13 +3,15 @@ import datetime
import arrow import arrow
import argparse import argparse
import logging import logging
import pkg_resources
import typing import typing
# Required for cryptography lib in python 3.7 # Required for cryptography lib in python 3.7
if sys.version_info < (3, 8): if sys.version_info < (3, 8):
import typing_extensions import typing_extensions
typing.Protocol = typing_extensions.Protocol typing.Protocol = typing_extensions.Protocol
from importlib_metadata import PackageNotFoundError, version
else:
from importlib.metadata import PackageNotFoundError, version
from .api import TConnectApi from .api import TConnectApi
from .sync.tandemsource.autoupdate import TandemSourceAutoupdate from .sync.tandemsource.autoupdate import TandemSourceAutoupdate
@@ -37,8 +39,8 @@ except Exception as e:
try: try:
__version__ = pkg_resources.require("tconnectsync")[0].version __version__ = version("tconnectsync")
except Exception: except PackageNotFoundError:
__version__ = "UNKNOWN" __version__ = "UNKNOWN"
def parse_args(*args, **kwargs): def parse_args(*args, **kwargs):
@@ -126,4 +128,3 @@ def main(*args, **kwargs):
# return exit code 0 if processed events # return exit code 0 if processed events
sys.exit(0 if added>0 else 1) sys.exit(0 if added>0 else 1)
+8 -4
View File
@@ -3,11 +3,15 @@ import time
import arrow import arrow
import logging import logging
import traceback import traceback
import pkg_resources
import collections import collections
from datetime import datetime from datetime import datetime
from pprint import pformat as pformat_base from pprint import pformat as pformat_base
if sys.version_info < (3, 8):
from importlib_metadata import PackageNotFoundError, version
else:
from importlib.metadata import PackageNotFoundError, version
from .nightscout import NightscoutApi from .nightscout import NightscoutApi
from .parser.nightscout import BASAL_EVENTTYPE, BOLUS_EVENTTYPE from .parser.nightscout import BASAL_EVENTTYPE, BOLUS_EVENTTYPE
from .parser.tconnect import TConnectEntry from .parser.tconnect import TConnectEntry
@@ -15,8 +19,8 @@ from .domain.tandemsource.event_class import EventClass
from .sync.tandemsource.choose_device import ChooseDevice from .sync.tandemsource.choose_device import ChooseDevice
try: try:
__version__ = pkg_resources.require("tconnectsync")[0].version __version__ = version("tconnectsync")
except Exception: except PackageNotFoundError:
__version__ = "UNKNOWN" __version__ = "UNKNOWN"
""" """
@@ -205,4 +209,4 @@ def run_sanitize(s, sanitizedData):
def pformat(*args, **kwargs): def pformat(*args, **kwargs):
kwargs['width'] = 160 kwargs['width'] = 160
return pformat_base(*args, **kwargs) return pformat_base(*args, **kwargs)