From 79d47de61106a4447bd5de671d5d5c4d21df31bc Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 15 Aug 2026 01:32:13 -0700 Subject: [PATCH] Keep setup bootstrap aligned with locked abxpkg --- archivebox/tests/test_setup_script.py | 5 ++++- bin/setup.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/archivebox/tests/test_setup_script.py b/archivebox/tests/test_setup_script.py index 06d0d292..e3647f58 100644 --- a/archivebox/tests/test_setup_script.py +++ b/archivebox/tests/test_setup_script.py @@ -1,6 +1,7 @@ import os import shutil import subprocess +import tomllib from pathlib import Path @@ -34,10 +35,12 @@ def test_setup_script_gives_archivebox_user_ownership_of_runtime_parent_dirs(): def test_setup_script_bootstraps_locked_abxpkg_version(): script = SETUP_SCRIPT.read_text() + lock = tomllib.loads((SETUP_SCRIPT.parents[1] / "uv.lock").read_text()) + locked_abxpkg_version = next(package["version"] for package in lock["package"] if package["name"] == "abxpkg") prepare_function = script.partition("prepare_abxpkg_environment() {")[2].partition("\n}")[0] install_function = script.partition("install_archivebox_with_uv() {")[2].partition("\n}")[0] - assert 'ABXPKG_PACKAGE="${ABXPKG_PACKAGE:-abxpkg==1.12.79}"' in script + assert f'ABXPKG_PACKAGE="${{ABXPKG_PACKAGE:-abxpkg=={locked_abxpkg_version}}}"' in script assert 'ARCHIVEBOX_PACKAGE="${ARCHIVEBOX_PACKAGE:-archivebox>=0.9.0rc0,<0.10}"' in script assert '--prerelease explicit --upgrade "$ARCHIVEBOX_PACKAGE"' in install_function assert "fix_root_install_ownership" in prepare_function diff --git a/bin/setup.sh b/bin/setup.sh index 5e262068..105324db 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -81,7 +81,7 @@ ARCHIVEBOX_PYTHON="${ARCHIVEBOX_PYTHON:-3.13}" ARCHIVEBOX_PACKAGE="${ARCHIVEBOX_PACKAGE:-archivebox>=0.9.0rc0,<0.10}" ARCHIVEBOX_PLATFORM="${ARCHIVEBOX_PLATFORM:-}" ARCHIVEBOX_COMPOSE_URL="${ARCHIVEBOX_COMPOSE_URL:-https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/${ARCHIVEBOX_BRANCH}/docker-compose.yml}" -ABXPKG_PACKAGE="${ABXPKG_PACKAGE:-abxpkg==1.12.79}" +ABXPKG_PACKAGE="${ABXPKG_PACKAGE:-abxpkg==1.12.81}" ABXPKG_LIB_DIR="${ABXPKG_LIB_DIR:-$HOME/.cache/archivebox/setup-abxpkg}" ARCHIVEBOX_HOME_DIR="$HOME/archivebox" ARCHIVEBOX_DATA_DIR="$ARCHIVEBOX_HOME_DIR/data"