diff --git a/README.md b/README.md index 3df44f5..c06ffea 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Weblate is a libre web-based translation tool with tight version control integration. It provides two user interfaces, propagation of translations across components, quality checks and automatic linking to source files. -**Shipped version:** 4.11~ynh2 +**Shipped version:** 4.11.2~ynh1 **Demo:** https://hosted.weblate.org/ diff --git a/README_fr.md b/README_fr.md index c83f448..894ff04 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Weblate est un outil de traduction libre avec une intégration étroite du contrôle de version. Il fournit deux interfaces utilisateur, la propagation des traductions entre les composants, les contrôles de qualité et la liaison automatique aux fichiers source. -**Version incluse :** 4.11~ynh2 +**Version incluse :** 4.11.2~ynh1 **Démo :** https://hosted.weblate.org/ 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 eca1516..03e927a 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~ynh2", + "version": "4.11.2~ynh2", "url": "https://weblate.org", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 4ddc7c9..27d6532 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,15 +5,20 @@ #================================================= # dependencies used by the app -pkg_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 libacl1 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 \ - liblz4-dev libzstd-dev libxxhash-dev python3-enchant libglib2.0-dev mailutils python-celery-common hub pkg-config python3-pkgconfig" +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 843318f..909b8b5 100755 --- a/scripts/install +++ b/scripts/install @@ -140,9 +140,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 BORG_OPENSSL_PREFIX=/usr/lib/x86_64-linux-gnu/ $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 d267dd5..11ad446 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -158,9 +158,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