From a30c224eec7c7ac332b4a442b81b799a1b36dd12 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 30 Dec 2021 13:03:56 +0100 Subject: [PATCH 01/14] 4.10.1 --- conf/settings.py | 19 ++++++++++++------- manifest.json | 2 +- scripts/_common.sh | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/conf/settings.py b/conf/settings.py index 4346245..634715a 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -87,6 +87,8 @@ DATABASES = { }, # Persistent connections "CONN_MAX_AGE": 0, + # Disable server-side cursors, might be needed with pgbouncer + "DISABLE_SERVER_SIDE_CURSORS": False, } } @@ -206,12 +208,6 @@ STATICFILES_FINDERS = ( # You can generate it using weblate/examples/generate-secret-key SECRET_KEY = "__KEY__" -_TEMPLATE_LOADERS = [ - "django.template.loaders.filesystem.Loader", - "django.template.loaders.app_directories.Loader", -] -if not DEBUG: - _TEMPLATE_LOADERS = [("django.template.loaders.cached.Loader", _TEMPLATE_LOADERS)] TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", @@ -225,8 +221,8 @@ TEMPLATES = [ "django.contrib.messages.context_processors.messages", "weblate.trans.context_processors.weblate_context", ], - "loaders": _TEMPLATE_LOADERS, }, + "APP_DIRS": True, } ] @@ -262,6 +258,14 @@ SOCIAL_AUTH_GITHUB_KEY = "" SOCIAL_AUTH_GITHUB_SECRET = "" SOCIAL_AUTH_GITHUB_SCOPE = ["user:email"] +SOCIAL_AUTH_GITHUB_ORG_KEY = "" +SOCIAL_AUTH_GITHUB_ORG_SECRET = "" +SOCIAL_AUTH_GITHUB_ORG_NAME = "" + +SOCIAL_AUTH_GITHUB_TEAM_KEY = "" +SOCIAL_AUTH_GITHUB_TEAM_SECRET = "" +SOCIAL_AUTH_GITHUB_TEAM_ID = "" + SOCIAL_AUTH_BITBUCKET_KEY = "" SOCIAL_AUTH_BITBUCKET_SECRET = "" SOCIAL_AUTH_BITBUCKET_VERIFIED_EMAILS_ONLY = True @@ -855,6 +859,7 @@ 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 88220a9..1cbfb96 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.9~ynh1", + "version": "4.10.1~ynh1", "url": "https://weblate.org", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 4421e61..f8abf05 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ pkg_dependencies="libxml2-dev libxslt-dev libfreetype6-dev libjpeg-dev libz-dev libpq-dev libglib2.0-dev mailutils python-celery-common hub" # Weblate's version for PIP and settings file -weblate_version="4.9" +weblate_version="4.10.1" debian_maj_version=$(sed 's/\..*//' /etc/debian_version) From 7ae663ecb985a694af3885a12c19a2ea5f0c7011 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 30 Dec 2021 12:04:05 +0000 Subject: [PATCH 02/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b524474..9d72b3b 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.9~ynh1 +**Shipped version:** 4.10.1~ynh1 **Demo:** https://hosted.weblate.org/ diff --git a/README_fr.md b/README_fr.md index 74c55b9..f6fd27e 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.9~ynh1 +**Version incluse :** 4.10.1~ynh1 **Démo :** https://hosted.weblate.org/ From b1e4c3836469f80c8f3575cbd4d910a3cbca32f5 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 28 Feb 2022 16:50:56 +0100 Subject: [PATCH 03/14] 4.11 --- conf/settings.py | 3 ++- manifest.json | 2 +- scripts/_common.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/settings.py b/conf/settings.py index 634715a..37de424 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -12,7 +12,7 @@ ################################################################################ ################################################################################ # -# Copyright © 2012 - 2021 Michal Čihař +# Copyright © 2012–2022 Michal Čihař # # This file is part of Weblate # @@ -798,6 +798,7 @@ CRISPY_TEMPLATE_PACK = "bootstrap3" # "weblate.addons.flags.BulkEditAddon", # "weblate.addons.generate.GenerateFileAddon", # "weblate.addons.generate.PseudolocaleAddon", +# "weblate.addons.generate.PrefillAddon", # "weblate.addons.json.JSONCustomizeAddon", # "weblate.addons.properties.PropertiesSortAddon", # "weblate.addons.git.GitSquashAddon", diff --git a/manifest.json b/manifest.json index 1cbfb96..1578114 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.10.1~ynh1", + "version": "4.11~ynh1", "url": "https://weblate.org", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index f8abf05..dc0cc21 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ pkg_dependencies="libxml2-dev libxslt-dev libfreetype6-dev libjpeg-dev libz-dev libpq-dev libglib2.0-dev mailutils python-celery-common hub" # Weblate's version for PIP and settings file -weblate_version="4.10.1" +weblate_version="4.11" debian_maj_version=$(sed 's/\..*//' /etc/debian_version) From 934db14173286686242fc84716400c482f031e91 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 28 Feb 2022 15:51:05 +0000 Subject: [PATCH 04/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d72b3b..9e4ad82 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.10.1~ynh1 +**Shipped version:** 4.11~ynh1 **Demo:** https://hosted.weblate.org/ diff --git a/README_fr.md b/README_fr.md index f6fd27e..0d4521c 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.10.1~ynh1 +**Version incluse :** 4.11~ynh1 **Démo :** https://hosted.weblate.org/ From 03de594ea4943b534b7c9ff3a0048720b2064f0e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 4 Mar 2022 12:05:07 +0100 Subject: [PATCH 05/14] 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 06/14] 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" From e54773af2a8e848c327ceae74d79bc596f9944b4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 5 Mar 2022 14:07:35 +0100 Subject: [PATCH 07/14] Fix upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 91e7e31..029cd8a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -159,8 +159,9 @@ upgrade() { ynh_systemd_action --service_name="$app-celery" --action="stop" + ynh_secure_remove --file="${final_path}/venv" virtualenv --python=python3 "${final_path}/venv" - chown -R "$app": "$final_path" + chown -R $app: "$final_path" #run source in a 'sub shell' ( @@ -169,10 +170,9 @@ upgrade() { set -o nounset cd "${final_path}" - sudo --user=$app $final_path/venv/bin/pip install --upgrade pip + 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 --upgrade Weblate=="$new_version" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply From b5bda8fcef0eb677f84dbcf5f17be0cf1f840dbd Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 6 Mar 2022 15:40:38 +0100 Subject: [PATCH 08/14] fix ffi SystemError: ffi_prep_closure(): bad user_data (it seems that the version of the libffi library seen at runtime is different from the 'ffi.h' file seen at compile-time) --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 5de2393..1d6aa9f 100755 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ chown -R "$app": "$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 cffi xcffib # 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..12df674 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ upgrade() { 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 cffi xcffib # 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 5a0e43195d599969d055111d71cc2d094fbf8349 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 7 Mar 2022 12:45:29 +0100 Subject: [PATCH 09/14] Fix cffi it seems that the version of the libffi library seen at runtime is different from the 'ffi.h' file seen at compile-time --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 1d6aa9f..247b2da 100755 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ chown -R "$app": "$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 xcffib + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 xcffib # 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 12df674..aa51035 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ upgrade() { 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 xcffib + sudo --user=$app $final_path/venv/bin/pip install --upgrade cffi==1.14 xcffib # 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 04173ff5e5e1fa1efdb45ee4530d651bbde84036 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 8 Mar 2022 22:39:27 +0100 Subject: [PATCH 10/14] remove xcffib --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 247b2da..5de2393 100755 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ chown -R "$app": "$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 xcffib + 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 aa51035..029cd8a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ upgrade() { 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 xcffib + 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" sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply From 2fd5bb0c66b415c70e109b89001ce390dbbd0ac1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 8 Mar 2022 22:39:32 +0100 Subject: [PATCH 11/14] Update check_process --- check_process | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 130a260..02166c3 100644 --- a/check_process +++ b/check_process @@ -15,8 +15,10 @@ setup_private=1 setup_public=1 upgrade=1 - #4.6.1 + # 4.6.1 upgrade=1 from_commit=3f8363cdc588e609a775cb8b78b9d080f96405d9 + # 4.9~ynh1 + upgrade=1 from_commit=7fec5a47a80e00458a31f1270c4ace822961e7bf backup_restore=1 multi_instance=1 port_already_use=0 From 287e9a9e1aaa4b979c28cbb74dd0b4fd5875de6d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 9 Mar 2022 22:32:30 +0100 Subject: [PATCH 12/14] remove upgrade check from no more working install --- check_process | 2 -- 1 file changed, 2 deletions(-) diff --git a/check_process b/check_process index 02166c3..12dcbbb 100644 --- a/check_process +++ b/check_process @@ -15,8 +15,6 @@ setup_private=1 setup_public=1 upgrade=1 - # 4.6.1 - upgrade=1 from_commit=3f8363cdc588e609a775cb8b78b9d080f96405d9 # 4.9~ynh1 upgrade=1 from_commit=7fec5a47a80e00458a31f1270c4ace822961e7bf backup_restore=1 From 54160b11abcc71d1d2aaa30e3cdf5ae3de14618e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 11 Mar 2022 17:37:20 +0100 Subject: [PATCH 13/14] 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 From d037bad848dec0127bbe78378df3e9518b194c32 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 11 Mar 2022 16:38:43 +0000 Subject: [PATCH 14/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9e4ad82..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~ynh1 +**Shipped version:** 4.11.2~ynh1 **Demo:** https://hosted.weblate.org/ diff --git a/README_fr.md b/README_fr.md index 0d4521c..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~ynh1 +**Version incluse :** 4.11.2~ynh1 **Démo :** https://hosted.weblate.org/