Merge pull request #18 from markqvist/python_compat

Remove unused importlib.metadata for Python 3.7+ compatibility
This commit is contained in:
acehoss 2023-05-11 13:28:27 -05:00 committed by GitHub
commit b7591aaa49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 7 deletions

View File

@ -7,7 +7,7 @@ license = "MIT"
readme = "README.md" readme = "README.md"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.9" python = "^3.7"
docopt = "^0.6.2" docopt = "^0.6.2"
rns = "^0.5.0" #{ git = "https://github.com/acehoss/Reticulum.git", branch = "feature/channel" } #{ path = "../Reticulum/", develop = true } # rns = "^0.5.0" #{ git = "https://github.com/acehoss/Reticulum.git", branch = "feature/channel" } #{ path = "../Reticulum/", develop = true } #
tomli = "^2.0.1" tomli = "^2.0.1"

View File

@ -31,8 +31,8 @@ def _get_version():
import tomli import tomli
return tomli.load(open(os.path.join(os.path.dirname(module_dir), "pyproject.toml"), "rb"))["tool"]["poetry"]["version"] return tomli.load(open(os.path.join(os.path.dirname(module_dir), "pyproject.toml"), "rb"))["tool"]["poetry"]["version"]
except: except:
from importlib.metadata import version return "0.0.0"
return version(__package__)
except: except:
return "0.0.0" return "0.0.0"

View File

@ -28,7 +28,6 @@ import asyncio
import base64 import base64
import enum import enum
import functools import functools
import importlib.metadata
import logging as __logging import logging as __logging
import os import os
import queue import queue

View File

@ -28,7 +28,6 @@ import asyncio
import base64 import base64
import enum import enum
import functools import functools
import importlib.metadata
import logging as __logging import logging as __logging
import os import os
import queue import queue

View File

@ -28,7 +28,6 @@ import asyncio
import base64 import base64
import enum import enum
import functools import functools
import importlib.metadata
import logging as __logging import logging as __logging
import os import os
import queue import queue

View File

@ -13,7 +13,6 @@ import os
def test_version(): def test_version():
# version = importlib.metadata.version(rnsh.__version__)
assert rnsh.__version__ != "0.0.0" assert rnsh.__version__ != "0.0.0"
assert rnsh.__version__ != "0.0.1" assert rnsh.__version__ != "0.0.1"