From 508e2db60e7f54108ca7749d0b8c5e3a89967058 Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Wed, 11 Mar 2026 16:50:04 -0400 Subject: [PATCH] [ci] Try fixing context processor --- vrobbler/context_processors.py | 44 ++++++++++++++++------------------ 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/vrobbler/context_processors.py b/vrobbler/context_processors.py index 33ba399..b815d8d 100644 --- a/vrobbler/context_processors.py +++ b/vrobbler/context_processors.py @@ -1,31 +1,29 @@ +import os import subprocess +from importlib.metadata import version as get_version from pathlib import Path def version_info(request): - PROJECT_ROOT = Path(__file__).resolve().parent.parent try: - commit = ( - subprocess.check_output( - ["git", "rev-parse", "--short", "HEAD"], - cwd=PROJECT_ROOT, - stderr=subprocess.DEVNULL, - ) - .decode("utf-8") - .strip() - ) - except (subprocess.SubprocessError, FileNotFoundError): - commit = "unknown" - - try: - pyproject = PROJECT_ROOT / "pyproject.toml" - version = "unknown" - if pyproject.exists(): - for line in pyproject.read_text().splitlines(): - if line.startswith("version = "): - version = line.split("=")[1].strip().strip('"') - break + app_version = get_version("vrobbler") except Exception: - version = "unknown" + app_version = "unknown" - return {"app_version": version, "git_commit": commit} + commit = os.environ.get("VROBBLER_COMMIT") + if not commit: + PROJECT_ROOT = Path(__file__).resolve().parent.parent + try: + commit = ( + subprocess.check_output( + ["git", "rev-parse", "--short", "HEAD"], + cwd=PROJECT_ROOT, + stderr=subprocess.DEVNULL, + ) + .decode("utf-8") + .strip() + ) + except (subprocess.SubprocessError, FileNotFoundError): + commit = "unknown" + + return {"app_version": app_version, "git_commit": commit}