Merge pull request #51 from YunoHost-Apps/testing

Testing

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.8~ynh1
+**Shipped version:** 4.9~ynh1
 
 **Demo:** https://hosted.weblate.org/
 

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.8~ynh1
+**Version incluse :** 4.9~ynh1
 
 **Démo :** https://hosted.weblate.org/
 

conf/settings.py

@@ -85,6 +85,8 @@ DATABASES = {
             # Change connection timeout in case you get MySQL gone away error:
             # "connect_timeout": 28800,
         },
+        # Persistent connections
+        "CONN_MAX_AGE": 0,
     }
 }
 
@@ -733,6 +735,8 @@ CRISPY_TEMPLATE_PACK = "bootstrap3"
 #     "weblate.checks.format.I18NextInterpolationCheck",
 #     "weblate.checks.format.ESTemplateLiteralsCheck",
 #     "weblate.checks.angularjs.AngularJSInterpolationCheck",
+#     "weblate.checks.icu.ICUMessageFormatCheck",
+#     "weblate.checks.icu.ICUSourceCheck",
 #     "weblate.checks.qt.QtFormatCheck",
 #     "weblate.checks.qt.QtPluralCheck",
 #     "weblate.checks.ruby.RubyFormatCheck",

manifest.json

@@ -6,7 +6,7 @@
 		"en": "Translation platform using Git and Python",
 		"fr": "Plateforme de traduction utilisant Git et Python" 
 	},
-	"version": "4.8~ynh1",
+	"version": "4.9~ynh1",
 	"url": "https://weblate.org",
 	"upstream": {
         "license": "AGPL-3.0",
@@ -36,8 +36,7 @@
 		"install" : [
 			{
 				"name": "domain",
-				"type": "domain",
+				"type": "domain"
-				"example": "domain.org"
 			},
 			{
 				"name": "path",
@@ -56,13 +55,11 @@
 			},
 			{
 				"name": "admin",
-				"type": "user",
+				"type": "user"
-				"example": "johndoe"
 			},
 			{
 				"name": "password",
-				"type": "password",
+				"type": "password"
-				"example": "Choose a password"
 			},
 			{
 				"name": "github_account",

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.8"
+weblate_version="4.9"
 
 debian_maj_version=$(sed 's/\..*//' /etc/debian_version)
 

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

scripts/restore

@@ -34,8 +34,6 @@ db_pwd=$(ynh_app_setting_get --app="$app" --key=psqlpwd)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 

scripts/upgrade

@@ -170,6 +170,8 @@ upgrade() {
 		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 --upgrade Weblate=="$new_version"
 		sudo --user=$app $final_path/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply