bump 0.2.4

Author: yzqzss

dokuWikiDumper/dump/doku_dumper.py

@@ -22,7 +22,8 @@
 from dokuWikiDumper.utils.ia_checker import any_recent_ia_item_exists
 from dokuWikiDumper.utils.util import print_with_lock as print
 
-from dokuWikiDumper.__version__ import DUMPER_VERSION, dokuWikiDumper_outdated_check
+from dokuWikiDumper.version import get_version
+from dokuWikiDumper.version_check import dokuWikiDumper_outdated_check
 from dokuWikiDumper.dump.content.content import dump_content
 from dokuWikiDumper.dump.html.html import dump_HTML
 from dokuWikiDumper.dump.info.info import update_info
@@ -36,7 +37,7 @@
 DEFAULT_THREADS = -1 # magic number, -1 means use 1 thread.
 
 def getArgumentParser():
-    parser = argparse.ArgumentParser(description='dokuWikiDumper Version: '+ DUMPER_VERSION)
+    parser = argparse.ArgumentParser(description='dokuWikiDumper Version: '+ get_version())
     parser.add_argument('url', help='URL of the dokuWiki (provide the doku.php URL)', type=str)
 
     group_download = parser.add_argument_group("Data to download", "What info download from the wiki")
@@ -98,7 +99,7 @@ def getArgumentParser():
                         help="Arguments for uploader.")
     parser.add_argument('--force', action='store_true', help='To dump even if a recent dump exists on IA')
     parser.add_argument('--user-agent', dest="user_agent", type=str,
-                        default='dokuWikiDumper/' + DUMPER_VERSION + ' (https://github.com/saveweb/dokuwiki-dumper)',
+                        default='dokuWikiDumper/' + get_version() + ' (https://github.com/saveweb/dokuwiki-dumper)',
                         help=argparse.SUPPRESS)
 
     return parser
@@ -247,7 +248,7 @@ def print_request(r: requests.Response, *args, **kwargs):
                'std_url': std_url,  # type: str
                'doku_url': doku_url,  # type: str
                'base_url': base_url,  # type: str
-               'dokuWikiDumper_version': DUMPER_VERSION,
+               'dokuWikiDumper_version': get_version(),  # type: str
                }
     update_config(dump_dir=dump_dir, config=_config)
     update_info(dump_dir, doku_url=doku_url, session=session)

dokuWikiDumper/exceptions.py

@@ -1,7 +1,7 @@
 import os
 import traceback
 
-from dokuWikiDumper.__version__ import DUMPER_VERSION
+from dokuWikiDumper.version import get_version
 
 
 class VersionOutdatedError(Exception):
@@ -95,7 +95,7 @@ def show_edge_case_warning(**context):
     "to help me improve the code, Thanks!")
     print("------------------------------------------")
     calledfrom = traceback.extract_stack(limit=2)[0]
-    print("VERSION:", DUMPER_VERSION)
+    print("VERSION:", get_version())
     print("FUNC:", f'{calledfrom.filename}:{calledfrom.lineno} ', "FUNC:", calledfrom.name)
     print("CONTEXT:", context)
     print("------------------------------------------")

dokuWikiDumper/__version__.py dokuWikiDumper/version.pydokuWikiDumper/__version__.py renamed to dokuWikiDumper/version.py

@@ -1,6 +1,13 @@
-DUMPER_VERSION = '0.2.3'
+__VERSION__ = 'unknown'
 
-from dokuWikiDumper.exceptions import VersionOutdatedError
+try:
+    from importlib.metadata import version
+    __VERSION__ = version('dokuwikidumper')
+except Exception:
+    pass
+
+def get_version():
+    return __VERSION__
 
 
 def get_latest_version():
@@ -21,17 +28,3 @@ def get_latest_version():
     else:
         print('Warning: Could not get latest version of dokuwikidumper.')
         return None
-
-def dokuWikiDumper_outdated_check():
-    latest_version = get_latest_version()
-    if latest_version is None:
-        return
-    if latest_version != DUMPER_VERSION:
-        print('=' * 47)
-        print(f'Warning: You are using an outdated version of dokuWikiDumper ({DUMPER_VERSION}).')
-        print(f'         The latest version is {latest_version}.')
-        print(f'         You can update dokuWikiDumper with "pip3 install --upgrade dokuWikiDumper".')
-        print('=' * 47, end='\n\n')
-        raise VersionOutdatedError(version=DUMPER_VERSION)
-
-    print(f'You are using the latest version of dokuwikidumper.')

dokuWikiDumper/version_check.py

@@ -0,0 +1,16 @@
+from dokuWikiDumper.exceptions import VersionOutdatedError
+from dokuWikiDumper.version import get_latest_version, get_version
+
+
+def dokuWikiDumper_outdated_check():
+    latest_version = get_latest_version()
+    if latest_version is None:
+        return
+    if latest_version != get_version():
+        print('=' * 47)
+        print(f'Warning: You are using an outdated version of dokuWikiDumper ({get_version()}).')
+        print(f'         The latest version is {latest_version}.')
+        print('         You can update dokuWikiDumper with "pip3 install --upgrade dokuWikiDumper".')
+        print('=' * 47, end='\n\n')
+        raise VersionOutdatedError(version=get_version())
+    print('You are using the latest version of dokuwikidumper.')

dokuWikiUploader/__version__.py

@@ -1,2 +1,2 @@
-from dokuWikiDumper.__version__ import DUMPER_VERSION
-UPLOADER_VERSION = DUMPER_VERSION
+from dokuWikiDumper.version import get_version
+UPLOADER_VERSION = get_version()

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dokuWikiDumper"
-version = "0.2.3"
+version = "0.2.4"
 description = "A tool for archiving DokuWiki"
 authors = [
     {name = "yzqzss", email = "yzqzss@yandex.com"},