From 03de594ea4943b534b7c9ff3a0048720b2064f0e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 4 Mar 2022 12:05:07 +0100 Subject: [PATCH 1/2] Trying to fix the upgrade --- scripts/install | 2 -- scripts/upgrade | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 5de2393..61d19c1 100755 --- a/scripts/install +++ b/scripts/install @@ -126,8 +126,6 @@ chown -R "$app": "$final_path" cd "${final_path}" sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel - # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install Weblate=="$weblate_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply diff --git a/scripts/upgrade b/scripts/upgrade index 05b2f3b..ed59f1c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -169,9 +169,8 @@ upgrade() { set -o nounset cd "${final_path}" - sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel - # Tmp fix - sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 + sudo --user=$app $final_path/venv/bin/pip install --upgrade pip + # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install --upgrade Weblate=="$new_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply From f3dec1623b80e9342f5483b553fdd9b2fd17b077 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 4 Mar 2022 17:12:00 +0100 Subject: [PATCH 2/2] another try --- scripts/install | 2 ++ scripts/upgrade | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 61d19c1..5de2393 100755 --- a/scripts/install +++ b/scripts/install @@ -126,6 +126,8 @@ chown -R "$app": "$final_path" cd "${final_path}" sudo --user=$app $final_path/venv/bin/pip install --upgrade pip setuptools wheel + # Tmp fix + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install Weblate=="$weblate_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply diff --git a/scripts/upgrade b/scripts/upgrade index ed59f1c..91e7e31 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,6 +170,8 @@ upgrade() { cd "${final_path}" sudo --user=$app $final_path/venv/bin/pip install --upgrade pip + # Tmp fix + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 # Still needed with latest version of weblate? sudo --user=$app $final_path/venv/bin/pip install --upgrade Weblate=="$new_version"