From 759cafb817087e69cdfcf6902064eaff5b743956 Mon Sep 17 00:00:00 2001
From: Ian McEwen <mian@cyverse.org>
Date: Tue, 19 Mar 2024 12:02:40 -0700
Subject: [PATCH] use importlib.metadata and packaging.version instead of
 pkg_resources

---
 meshtastic/__main__.py |  4 ++--
 meshtastic/util.py     | 19 +++++++++++++------
 meshtastic/version.py  | 11 +++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 meshtastic/version.py

diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py
index 51828f3..13c5af4 100644
--- a/meshtastic/__main__.py
+++ b/meshtastic/__main__.py
@@ -9,7 +9,6 @@ import platform
 import sys
 import time
 
-import pkg_resources
 import pyqrcode
 import yaml
 from google.protobuf.json_format import MessageToDict
@@ -18,6 +17,7 @@ from pubsub import pub
 import meshtastic.test
 import meshtastic.util
 from meshtastic import channel_pb2, config_pb2, portnums_pb2, remote_hardware
+from meshtastic.version import get_active_version
 from meshtastic.__init__ import BROADCAST_ADDR
 from meshtastic.ble_interface import BLEInterface
 from meshtastic.globals import Globals
@@ -1399,7 +1399,7 @@ def initParser():
 
     parser.set_defaults(deprecated=None)
 
-    the_version = pkg_resources.get_distribution("meshtastic").version
+    the_version = get_active_version()
     parser.add_argument("--version", action="version", version=f"{the_version}")
 
     parser.add_argument(
diff --git a/meshtastic/util.py b/meshtastic/util.py
index 7a5dd10..0c2fd44 100644
--- a/meshtastic/util.py
+++ b/meshtastic/util.py
@@ -12,12 +12,13 @@ import time
 import traceback
 from queue import Queue
 
-import pkg_resources
+import packaging.version as pkg_version
 import requests
 import serial
 import serial.tools.list_ports
 
 from meshtastic.supported_device import supported_devices
+from meshtastic.version import get_active_version
 
 """Some devices such as a seger jlink we never want to accidentally open"""
 blacklistVids = dict.fromkeys([0x1366])
@@ -269,7 +270,7 @@ def support_info():
     print(f"   Machine: {platform.uname().machine}")
     print(f"   Encoding (stdin): {sys.stdin.encoding}")
     print(f"   Encoding (stdout): {sys.stdout.encoding}")
-    the_version = pkg_resources.get_distribution("meshtastic").version
+    the_version = get_active_version()
     pypi_version = check_if_newer_version()
     if pypi_version:
         print(
@@ -599,9 +600,15 @@ def check_if_newer_version():
         pypi_version = data["info"]["version"]
     except Exception:
         pass
-    act_version = pkg_resources.get_distribution("meshtastic").version
-    if pypi_version and pkg_resources.parse_version(
-        pypi_version
-    ) <= pkg_resources.parse_version(act_version):
+    act_version = get_active_version()
+
+    try:
+        parsed_act_version = pkg_version.parse(act_version)
+        parsed_pypi_version = pkg_version.parse(pypi_version)
+    except pkg_version.InvalidVersion:
+        return pypi_version
+
+    if parsed_pypi_version <= parsed_act_version:
         return None
+
     return pypi_version
diff --git a/meshtastic/version.py b/meshtastic/version.py
new file mode 100644
index 0000000..bdc69eb
--- /dev/null
+++ b/meshtastic/version.py
@@ -0,0 +1,11 @@
+import sys
+try:
+    from importlib.metadata import version
+except:
+    import pkg_resources
+
+def get_active_version():
+    if "importlib.metadata" in sys.modules:
+        return version("meshtastic")
+    else:
+        return pkg_resources.get_distribution("meshtastic").version