From d3d05f5f64f4112ac4386e3288e3b9cb472109da Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 14 Nov 2023 00:21:09 -0800 Subject: [PATCH] add fallback version detection mode --- archivebox/config.py | 10 +++++++++- archivebox/main.py | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/archivebox/config.py b/archivebox/config.py index 99a1847c..9a5e0d35 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -377,7 +377,15 @@ ALLOWED_IN_OUTPUT_DIR = { } def get_version(config): - return importlib.metadata.version(__package__ or 'archivebox') + try: + return importlib.metadata.version(__package__ or 'archivebox') + except importlib.metadata.PackageNotFoundError: + pyproject_config = (config['PACKAGE_DIR'] / 'pyproject.toml').read_text() + for line in pyproject_config: + if line.startswith('version = '): + return line.split(' = ', 1)[-1].strip('"') + + raise Exception('Failed to detect installed archivebox version!') def get_commit_hash(config): try: diff --git a/archivebox/main.py b/archivebox/main.py index 5ce1e288..b0e45bac 100755 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -217,8 +217,8 @@ def version(quiet: bool=False, print(VERSION) if not quiet: - # 0.6.3 - # ArchiveBox v0.6.3 Cpython Linux Linux-4.19.121-linuxkit-x86_64-with-glibc2.28 x86_64 (in Docker) (in TTY) + # 0.7.1 + # ArchiveBox v0.7.1 Cpython Linux Linux-4.19.121-linuxkit-x86_64-with-glibc2.28 x86_64 (in Docker) (in TTY) # DEBUG=False IN_DOCKER=True IN_QEMU=False IS_TTY=True TZ=UTC FS_ATOMIC=True FS_REMOTE=False FS_PERMS=644 FS_USER=501:20 SEARCH_BACKEND=ripgrep p = platform.uname()