From 6c2aa3089a212f23e4b878d65703517feb6b4ecd Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sun, 1 May 2022 16:40:26 +0800 Subject: [PATCH] Use importlib to retrieve package version --- qiling/__init__.py | 7 ++++++- qiling/__version__.py | 3 --- setup.py | 9 ++------- 3 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 qiling/__version__.py diff --git a/qiling/__init__.py b/qiling/__init__.py index 375f0373b..96f113377 100644 --- a/qiling/__init__.py +++ b/qiling/__init__.py @@ -1,4 +1,9 @@ +import importlib.metadata from .core import Qiling -from .__version__ import __version__ + +try: + __version__ = importlib.metadata.version(__package__ or __name__) +except importlib.metadata.PackageNotFoundError: + __version__ = "0.0.0" __all__ = ['Qiling'] diff --git a/qiling/__version__.py b/qiling/__version__.py deleted file mode 100644 index 94f2af16c..000000000 --- a/qiling/__version__.py +++ /dev/null @@ -1,3 +0,0 @@ -# NOTE: use "-dev" for dev branch -#__version__ = "1.4.3" -__version__ = "1.4.3" + "-dev" diff --git a/setup.py b/setup.py index d19877a57..5496da6cd 100644 --- a/setup.py +++ b/setup.py @@ -2,15 +2,10 @@ # # Python setup for Qiling framework -import sys, os from setuptools import setup, find_packages -here = os.path.abspath(os.path.dirname(__file__)) -gb = {} -with open(os.path.join(here, "qiling", "__version__.py"), "r+") as f: - exec(f.read(), gb) - -VERSION = gb['__version__'] +# NOTE: use "-dev" for dev branch +VERSION = "1.4.3" + "-dev" requirements = [ "capstone>=4.0.1",