From b8ab01710959d4debc63c441e7abff56ff98b676 Mon Sep 17 00:00:00 2001 From: qup42 Date: Fri, 13 Mar 2026 10:34:16 +0100 Subject: [PATCH 1/3] Replace old version detection logic --- pyproject.toml | 2 +- qlever/settings.py | 25 +++---------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0fa9f184..69d2d8fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "QLever-UI" -version = "0.1.0" +version = "0.5.45" description = "A user-friendly interface for the QLever SPARQL engine" readme = "README.md" requires-python = ">=3.12" diff --git a/qlever/settings.py b/qlever/settings.py index f4debe54..df3e8ff4 100644 --- a/qlever/settings.py +++ b/qlever/settings.py @@ -11,8 +11,6 @@ """ import os -import subprocess -import re import environ try: @@ -193,28 +191,11 @@ ) try: - # Get git info from files in .git - with open(".git/HEAD", "r") as headFile: - GIT_HEAD = headFile.read().strip() - with open(".git/{}".format(GIT_HEAD.split(" ")[-1]), "r") as hashFile: - GIT_HASH = hashFile.read()[:7] - STATIC_VERSION = "Git commit {} on {}".format( - GIT_HASH, GIT_HEAD.split("/")[-1] - ) -except Exception as e: - print(e) + from importlib.metadata import version, PackageNotFoundError + STATIC_VERSION = "Version: {}".format(version("QLever-UI")) +except PackageNotFoundError: pass -if not STATIC_VERSION: - # get svn version info if git was not successful - try: - versionInfo = ( - subprocess.check_output("svn info -r HEAD;", shell=True) - ).decode("utf-8") - STATIC_VERSION = re.search(r"(Revision: \d+)", versionInfo).group(1) - except: - pass - IMPORT_EXPORT_USE_TRANSACTIONS = True LOGIN_URL = "/admin/login/" From 3389b5501aebe04b15740f664ebb4036b73a575d Mon Sep 17 00:00:00 2001 From: qup42 Date: Sat, 18 Apr 2026 10:55:43 +0200 Subject: [PATCH 2/3] Use git version if available, else version of package --- qlever/settings.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/qlever/settings.py b/qlever/settings.py index df3e8ff4..108ae68e 100644 --- a/qlever/settings.py +++ b/qlever/settings.py @@ -191,10 +191,27 @@ ) try: - from importlib.metadata import version, PackageNotFoundError - STATIC_VERSION = "Version: {}".format(version("QLever-UI")) -except PackageNotFoundError: + # Get git info from files in .git + with open(".git/HEAD", "r") as headFile: + GIT_HEAD = headFile.read().strip() + with open(".git/{}".format(GIT_HEAD.split(" ")[-1]), "r") as hashFile: + GIT_HASH = hashFile.read()[:7] + STATIC_VERSION = "Git commit {} on {}".format( + GIT_HASH, GIT_HEAD.split("/")[-1] + ) +except OSError: + # Git Info not available pass +except Exception: + # Should not happen + print("Error determining git version.") + +if not STATIC_VERSION: + from importlib.metadata import version, PackageNotFoundError + try: + STATIC_VERSION = "Version: {}".format(version("QLever-UI")) + except PackageNotFoundError: + pass IMPORT_EXPORT_USE_TRANSACTIONS = True From 3f062d84908f48a43222819845e6cee3aa133a1c Mon Sep 17 00:00:00 2001 From: qup42 Date: Sat, 18 Apr 2026 10:56:05 +0200 Subject: [PATCH 3/3] Set version in sync with qlever --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f36ded61..1a182fbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "QLever-UI" -version = "0.5.45" +version = "0.5.46" description = "A user-friendly interface for the QLever SPARQL engine" readme = "README.md" requires-python = ">=3.10"