Merge remote-tracking branch 'origin/main'

rnsh/__init__.py

@@ -31,8 +31,12 @@ 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__)
+            try:
+                import pkg_resources
+                return pkg_resources.get_distribution("rnsh").version
+            except:
+                return "0.0.0"
+
     except:
         return "0.0.0"
 

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

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

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

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"