From c5d715bfdaec8ab2d7b169e10e3d01c5f2fda889 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Wed, 19 Aug 2026 03:49:13 -0700 Subject: [PATCH] Keep the Docker downloader base in sync --- Dockerfile | 4 ++-- archivebox/tests/test_version_metadata.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3aa7c74..2cf09d27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,10 @@ # --build-context abx-plugins=../abx-plugins \ # -t archivebox/abx-dl:dev # docker buildx build . -f Dockerfile \ -# --build-arg ABX_DL_IMAGE=archivebox/abx-dl:1.12.178 \ +# --build-arg ABX_DL_IMAGE=archivebox/abx-dl:1.12.182 \ # -t archivebox:multistage -ARG ABX_DL_IMAGE=archivebox/abx-dl:1.12.178 +ARG ABX_DL_IMAGE=archivebox/abx-dl:1.12.182 FROM archivebox/sonic:1.4.9 AS sonic FROM ${ABX_DL_IMAGE} AS archivebox-runtime-base diff --git a/archivebox/tests/test_version_metadata.py b/archivebox/tests/test_version_metadata.py index 4c815e4a..9dda90be 100644 --- a/archivebox/tests/test_version_metadata.py +++ b/archivebox/tests/test_version_metadata.py @@ -1,5 +1,6 @@ import json import os +import re import shutil import subprocess import sys @@ -13,10 +14,18 @@ REPO_DIR = Path(__file__).resolve().parents[2] def test_release_metadata_versions_match() -> None: - project_version = tomllib.loads((REPO_DIR / "pyproject.toml").read_text())["project"]["version"] + project = tomllib.loads((REPO_DIR / "pyproject.toml").read_text())["project"] + project_version = project["version"] package_version = json.loads((REPO_DIR / "etc/package.json").read_text())["version"] + abx_dl_version = next( + dependency.removeprefix("abx-dl==") for dependency in project["dependencies"] if dependency.startswith("abx-dl==") + ) + dockerfile = (REPO_DIR / "Dockerfile").read_text() + docker_abx_dl_version = re.search(r"^ARG ABX_DL_IMAGE=archivebox/abx-dl:([^\s]+)$", dockerfile, re.MULTILINE) assert package_version == project_version + assert docker_abx_dl_version + assert docker_abx_dl_version.group(1) == abx_dl_version def _resolve_git_with_abxpkg(tmp_path: Path) -> Path: