From a12bfd9ab38282b10ed30c8e24ff7fffde51da18 Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Tue, 17 Feb 2026 11:12:23 +0100 Subject: [PATCH] Unconditionally create venv and install deps Remove the conditional retry logic and always run the venv creation, pip install of calibreweb, and uv sync without build isolation. Updated ct/calibre-web.sh and install/calibre-web-install.sh to: run `$STD uv venv`, `$STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir calibreweb`, then `$STD uv sync --no-dev --no-build-isolation`. This simplifies the dependency installation flow and ensures the virtualenv and package are installed before syncing. --- ct/calibre-web.sh | 9 +++------ install/calibre-web-install.sh | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ct/calibre-web.sh b/ct/calibre-web.sh index 63a5c1221..d16139d35 100644 --- a/ct/calibre-web.sh +++ b/ct/calibre-web.sh @@ -43,12 +43,9 @@ function update_script() { msg_info "Installing Dependencies" cd /opt/calibre-web - if ! $STD uv sync --no-dev; then - msg_info "Retrying dependency install without build isolation" - $STD uv venv - $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir calibreweb - $STD uv sync --no-dev --no-build-isolation - fi + $STD uv venv + $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir calibreweb + $STD uv sync --no-dev --no-build-isolation msg_ok "Installed Dependencies" msg_info "Restoring Data" diff --git a/install/calibre-web-install.sh b/install/calibre-web-install.sh index 566e50069..41e971332 100644 --- a/install/calibre-web-install.sh +++ b/install/calibre-web-install.sh @@ -32,12 +32,9 @@ setup_uv msg_info "Installing Python Dependencies" cd /opt/calibre-web -if ! $STD uv sync --no-dev; then - msg_info "Retrying Python dependency install without build isolation" - $STD uv venv - $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir calibreweb - $STD uv sync --no-dev --no-build-isolation -fi +$STD uv venv +$STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir calibreweb +$STD uv sync --no-dev --no-build-isolation msg_ok "Installed Python Dependencies" msg_info "Creating Service"