From ee5685353ba45cc69ddc513f6e6eeb744b58398b Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Fri, 17 Apr 2026 10:37:10 -0700 Subject: [PATCH] rename abx-pkg to abxpkg --- bin/release.sh | 6 +++--- bin/test_plugins.sh | 2 +- old/TODO_hook_architecture.md | 6 +++--- pyproject.toml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/release.sh b/bin/release.sh index 0df1f963..0faa1604 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -147,14 +147,14 @@ PY } update_internal_dependencies() { - local abxbus_version abx_pkg_version abx_plugins_version abx_dl_version + local abxbus_version abxpkg_version abx_plugins_version abx_dl_version abxbus_version="$(read_repo_version "${WORKSPACE_DIR}/abxbus" || true)" - abx_pkg_version="$(read_repo_version "${WORKSPACE_DIR}/abx-pkg" || true)" + abxpkg_version="$(read_repo_version "${WORKSPACE_DIR}/abx-pkg" || true)" abx_plugins_version="$(read_repo_version "${WORKSPACE_DIR}/abx-plugins" || true)" abx_dl_version="$(read_repo_version "${WORKSPACE_DIR}/abx-dl" || true)" - python3 - "${abxbus_version}" "${abx_pkg_version}" "${abx_plugins_version}" "${abx_dl_version}" <<'PY' + python3 - "${abxbus_version}" "${abxpkg_version}" "${abx_plugins_version}" "${abx_dl_version}" <<'PY' from pathlib import Path import re import sys diff --git a/bin/test_plugins.sh b/bin/test_plugins.sh index 2cef86e0..62ea61a3 100755 --- a/bin/test_plugins.sh +++ b/bin/test_plugins.sh @@ -191,7 +191,7 @@ if [ "$COVERAGE_REPORT_ONLY" = true ]; then exit 0 fi -# Set DATA_DIR for tests (required by abx_pkg and plugins) +# Set DATA_DIR for tests (required by abxpkg and plugins) # Use temp dir to isolate tests from project files if [ -z "${DATA_DIR:-}" ]; then export DATA_DIR=$(mktemp -d -t archivebox_plugin_tests.XXXXXX) diff --git a/old/TODO_hook_architecture.md b/old/TODO_hook_architecture.md index bb6b87cc..15d261f4 100755 --- a/old/TODO_hook_architecture.md +++ b/old/TODO_hook_architecture.md @@ -58,7 +58,7 @@ Crawl.run() 5. **Trust abx-pkg** - Never use `shutil.which()`, `subprocess.run([bin, '--version'])`, or manual hash calculation. ```python # ✅ CORRECT - abx-pkg handles everything - from abx_pkg import Binary, PipProvider, EnvProvider + from abxpkg import Binary, PipProvider, EnvProvider binary = Binary(name='wget', binproviders=[PipProvider(), EnvProvider()]).load() # binary.abspath, binary.version, binary.sha256 are all populated automatically @@ -130,7 +130,7 @@ import json def find_wget() -> dict | None: """Find wget binary using abx-pkg.""" try: - from abx_pkg import Binary, AptProvider, BrewProvider, EnvProvider + from abxpkg import Binary, AptProvider, BrewProvider, EnvProvider binary = Binary(name='wget', binproviders=[AptProvider(), BrewProvider(), EnvProvider()]) loaded = binary.load() @@ -201,7 +201,7 @@ if __name__ == '__main__': import json import sys import rich_click as click -from abx_pkg import Binary, PipProvider +from abxpkg import Binary, PipProvider @click.command() @click.option('--dependency-id', required=True) diff --git a/pyproject.toml b/pyproject.toml index a8c24bc1..a6cf9625 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,7 +79,7 @@ dependencies = [ ### Extractor dependencies (optional binaries detected at runtime via shutil.which) ### Binary/Package Management "abxbus>=2.4.9", # explicit direct dep so local dev env resolves sibling abxbus repo, matching abx-dl EventBus API - "abx-pkg>=1.9.27", # for: detecting, versioning, and installing binaries via apt/brew/pip/npm + "abxpkg>=1.10.4", # for: detecting, versioning, and installing binaries via apt/brew/pip/npm "abx-plugins>=1.10.29", # shared ArchiveBox plugin package with install_args-only overrides "abx-dl>=1.10.29", # shared ArchiveBox downloader package with install_args-only overrides ### UUID7 backport for Python <3.14 @@ -155,7 +155,7 @@ dev = [ environments = ["sys_platform == 'darwin'", "sys_platform == 'linux'"] package = true exclude-newer = "5 days" -exclude-newer-package = { abx-plugins = "1 second", abx-dl = "1 second", abx-pkg = "1 second", abxbus = "1 second" } +exclude-newer-package = { abx-plugins = "1 second", abx-dl = "1 second", abxpkg = "1 second", abxbus = "1 second" } # compile-bytecode = true [build-system]