From 54160b11abcc71d1d2aaa30e3cdf5ae3de14618e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 11 Mar 2022 17:37:20 +0100 Subject: [PATCH] 4.11.2 --- conf/settings.py | 1 - manifest.json | 2 +- scripts/_common.sh | 18 ++++++++++++------ scripts/install | 7 ++++--- scripts/upgrade | 7 ++++--- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/conf/settings.py b/conf/settings.py index 37de424..5643e8d 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -860,7 +860,6 @@ REST_FRAMEWORK = { else "rest_framework.permissions.IsAuthenticatedOrReadOnly" ], "DEFAULT_AUTHENTICATION_CLASSES": ( - "weblate.api.authentication.ProjectTokenAuthentication", "rest_framework.authentication.TokenAuthentication", "weblate.api.authentication.BearerAuthentication", "rest_framework.authentication.SessionAuthentication", diff --git a/manifest.json b/manifest.json index 1578114..0938bd6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Translation platform using Git and Python", "fr": "Plateforme de traduction utilisant Git et Python" }, - "version": "4.11~ynh1", + "version": "4.11.2~ynh1", "url": "https://weblate.org", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index dc0cc21..27d6532 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,14 +5,20 @@ #================================================= # dependencies used by the app -pkg_dependencies="libxml2-dev libxslt-dev libfreetype6-dev libjpeg-dev libz-dev libyaml-dev \ - libcairo-dev gir1.2-pango-1.0 libgirepository1.0-dev libacl1-dev libssl-dev \ - build-essential python3-gdbm python3-enchant python3-dev python3-pip python3-virtualenv virtualenv git \ - uwsgi uwsgi-plugin-python3 redis-server postgresql postgresql-contrib \ - libpq-dev libglib2.0-dev mailutils python-celery-common hub" +weblate_dependencies="libxml2-dev libxslt-dev libfreetype6-dev libjpeg-dev libz-dev libyaml-dev \ + libffi-dev libcairo-dev gir1.2-pango-1.0 libgirepository1.0-dev \ + libacl1-dev libssl-dev libpq-dev libjpeg62-turbo-dev build-essential \ + python3-gdbm python3-dev python3-pip python3-virtualenv virtualenv git \ + uwsgi uwsgi-plugin-python3 redis-server postgresql postgresql-contrib hub" + +# because weblate install borgbackup +borgbackup_dependencies="libacl1-dev libacl1 libssl-dev liblz4-dev libzstd-dev libxxhash-dev \ + build-essential pkg-config python3-pkgconfig" + +pkg_dependencies="$weblate_dependencies $borgbackup_dependencies" # Weblate's version for PIP and settings file -weblate_version="4.11" +weblate_version="4.11.2" debian_maj_version=$(sed 's/\..*//' /etc/debian_version) diff --git a/scripts/install b/scripts/install index 5de2393..4def320 100755 --- a/scripts/install +++ b/scripts/install @@ -125,9 +125,10 @@ chown -R "$app": "$final_path" 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 setuptools wheel pkgconfig + + # Read the "Note" section in https://docs.weblate.org/en/weblate-4.11/admin/install/venv-debian.html#python-modules + sudo --user=$app $final_path/venv/bin/pip install --force-reinstall --no-binary :all: cffi # 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 029cd8a..b533c03 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,9 +170,10 @@ 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 setuptools wheel pkgconfig + + # Read the "Note" section in https://docs.weblate.org/en/weblate-4.11/admin/install/venv-debian.html#python-modules + sudo --user=$app $final_path/venv/bin/pip install --force-reinstall --no-binary :all: cffi # 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