From 191d9655038d4b1aab9627b727773183877e5302 Mon Sep 17 00:00:00 2001 From: vhsdream Date: Wed, 27 Aug 2025 14:01:16 -0400 Subject: [PATCH] Autocaliweb: use uv lock - Broken until ACW is updated (issue with pyopenssl/cryptography) --- ct/autocaliweb.sh | 9 ++++----- install/autocaliweb-install.sh | 6 +----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ct/autocaliweb.sh b/ct/autocaliweb.sh index ceeccd3f..e7f33ba0 100644 --- a/ct/autocaliweb.sh +++ b/ct/autocaliweb.sh @@ -42,11 +42,10 @@ function update_script() { fetch_and_deploy_gh_release "autocaliweb" "gelbphoenix/autocaliweb" "tarball" "latest" "/opt/autocaliweb" msg_info "Updating ${APP}" cd "$INSTALL_DIR" - $STD source "$VIRTUAL_ENV"/bin/activate - echo "pyopenssl>=24.2.1" >./constraint.txt - $STD uv pip compile requirements.txt optional-requirements.txt -c constraint.txt -o combined-requirements.lock - $STD uv pip sync combined-requirements.lock - $STD deactivate + if [[ ! -d "$VIRTUAL_ENV" ]]; then + $STD uv venv "$VIRTUAL_ENV" + fi + $STD uv sync --all-extras --active cd "$INSTALL_DIR"/koreader/plugins PLUGIN_DIGEST="$(find acwsync.koplugin -type f -name "*.lua" -o -name "*.json" | sort | xargs sha256sum | sha256sum | cut -d' ' -f1)" echo "Plugin files digest: $PLUGIN_DIGEST" >acwsync.koplugin/${PLUGIN_DIGEST}.digest diff --git a/install/autocaliweb-install.sh b/install/autocaliweb-install.sh index e9d04159..9a97b37f 100644 --- a/install/autocaliweb-install.sh +++ b/install/autocaliweb-install.sh @@ -82,11 +82,7 @@ sed 's/^/v/' ~/.autocaliweb >"$INSTALL_DIR"/ACW_RELEASE cd "$INSTALL_DIR" $STD uv venv "$VIRTUAL_ENV" -$STD source "$VIRTUAL_ENV"/bin/activate -echo "pyopenssl>=24.2.1" >./constraint.txt -$STD uv pip compile requirements.txt optional-requirements.txt -c constraint.txt -o combined-requirements.lock -$STD uv pip sync combined-requirements.lock -$STD deactivate +$STD uv sync --all-extras --active cat <./dirs.json { "ingest_folder": "$INGEST_DIR",