Merge remote-tracking branch 'origin/main'

This commit is contained in:
Aaron Heise 2023-05-12 09:08:02 -05:00
commit 26368c9d7c
No known key found for this signature in database
GPG Key ID: 6BA54088C41DE8BF
5 changed files with 6 additions and 6 deletions

View File

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