From 494ebb29fbcdddce7c68117b2f1b23dfc398030d Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Thu, 11 May 2023 20:18:28 +0200
Subject: [PATCH 1/2] Remove unused importlib.metadata for Python 3.7+
 compatibility

---
 pyproject.toml     | 2 +-
 rnsh/__init__.py   | 4 ++--
 rnsh/initiator.py  | 1 -
 rnsh/listener.py   | 1 -
 rnsh/rnsh.py       | 1 -
 tests/test_rnsh.py | 1 -
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 19b91f5..0a9d1b5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ license = "MIT"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.7"
 docopt = "^0.6.2"
 rns = "^0.5.0" #{ git = "https://github.com/acehoss/Reticulum.git", branch = "feature/channel" }  #{ path = "../Reticulum/", develop = true }  #
 tomli = "^2.0.1"
diff --git a/rnsh/__init__.py b/rnsh/__init__.py
index 2d1eb6d..99afd9f 100644
--- a/rnsh/__init__.py
+++ b/rnsh/__init__.py
@@ -31,8 +31,8 @@ def _get_version():
             import tomli
             return tomli.load(open(os.path.join(os.path.dirname(module_dir), "pyproject.toml"), "rb"))["tool"]["poetry"]["version"]
         except:
-            from importlib.metadata import version
-            return version(__package__)
+            return "0.0.0"
+
     except:
         return "0.0.0"
 
diff --git a/rnsh/initiator.py b/rnsh/initiator.py
index 8a82290..9f62ab8 100644
--- a/rnsh/initiator.py
+++ b/rnsh/initiator.py
@@ -28,7 +28,6 @@ import asyncio
 import base64
 import enum
 import functools
-import importlib.metadata
 import logging as __logging
 import os
 import queue
diff --git a/rnsh/listener.py b/rnsh/listener.py
index 07b6a0e..d3e617f 100644
--- a/rnsh/listener.py
+++ b/rnsh/listener.py
@@ -28,7 +28,6 @@ import asyncio
 import base64
 import enum
 import functools
-import importlib.metadata
 import logging as __logging
 import os
 import queue
diff --git a/rnsh/rnsh.py b/rnsh/rnsh.py
index 5f11040..b4f41d8 100644
--- a/rnsh/rnsh.py
+++ b/rnsh/rnsh.py
@@ -28,7 +28,6 @@ import asyncio
 import base64
 import enum
 import functools
-import importlib.metadata
 import logging as __logging
 import os
 import queue
diff --git a/tests/test_rnsh.py b/tests/test_rnsh.py
index 9057d6f..6132268 100644
--- a/tests/test_rnsh.py
+++ b/tests/test_rnsh.py
@@ -13,7 +13,6 @@ import os
 
 
 def test_version():
-    # version = importlib.metadata.version(rnsh.__version__)
     assert rnsh.__version__ != "0.0.0"
     assert rnsh.__version__ != "0.0.1"
 

From 4897cd0387ed24b099cb806b3e51a95e5104f6ac Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Thu, 11 May 2023 20:52:15 +0200
Subject: [PATCH 2/2] Fixed missing version resolution without pyproject.toml

---
 rnsh/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rnsh/__init__.py b/rnsh/__init__.py
index 99afd9f..7c1e6b2 100644
--- a/rnsh/__init__.py
+++ b/rnsh/__init__.py
@@ -31,7 +31,11 @@ def _get_version():
             import tomli
             return tomli.load(open(os.path.join(os.path.dirname(module_dir), "pyproject.toml"), "rb"))["tool"]["poetry"]["version"]
         except:
-            return "0.0.0"
+            try:
+                import pkg_resources
+                return pkg_resources.get_distribution("rnsh").version
+            except:
+                return "0.0.0"
 
     except:
         return "0.0.0"