Merge pull request #53 from YunoHost-Apps/master

Merge changes in testing

.github/workflows/updater.sh

@@ -19,7 +19,7 @@
 # Fetching information
 app=$(cat manifest.json | jq -j '.id')
 current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-upstream_version=$(curl -Ls https://pypi.org/pypi/$pythonPackage/json | jq -r .info.version)
+upstream_version=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.version)
 
 # Setting up the environment variables
 echo "Current version: $current_version"
@@ -43,7 +43,7 @@ fi
 #=================================================
 
 # Replace new version in _common.sh
-sed -i "s/app_version=.*/app_version=$upstream_version/" scripts/_common.sh
+sed -i "s/^app_version=.*/app_version=$upstream_version/" scripts/_common.sh
 
 #=================================================
 # GENERIC FINALIZATION

.github/workflows/updater.yml

@@ -40,7 +40,7 @@ jobs:
           committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
           author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
           signoff: false
-          base: testing
+          base: master
           branch: ci-auto-update-v${{ env.VERSION }}
           delete-branch: true
           title: 'Upgrade to version ${{ env.VERSION }}'

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Home automation platform
 
-**Shipped version:** 2021.12.8~ynh1
+**Shipped version:** 2021.12.10~ynh1
 
 **Demo:** https://demo.home-assistant.io
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Plateforme domotique
 
-**Version incluse :** 2021.12.8~ynh1
+**Version incluse :** 2021.12.10~ynh1
 
 **Démo :** https://demo.home-assistant.io
 

conf/homeassistant_conf_files/bin/upgrade_homeassistant.sh

@@ -42,10 +42,10 @@ fi
 # Check User and permissions
 [ ! -z "$DEBUG" ] && log "User '$(whoami)' is running that script and '$(has_sudo)'."
 
-# create the virtual environment
+# upgrade the virtual environment
 MY_PYTHON=$(readlink -e "$final_path/bin/python")
 [ ! -z "$DEBUG" ] && log "Using pyhton '$MY_PYTHON'."
-$MY_PYTHON -m venv "$final_path"
+$MY_PYTHON -m venv --upgrade "$final_path"
 
 # activate the virtual environment
 source "$final_path/bin/activate"
@@ -53,6 +53,9 @@ source "$final_path/bin/activate"
 # install last version of wheel
 pip --cache-dir "$data_path/.cache" install --upgrade wheel
 
+# install last version of mysqlclient
+pip --cache-dir "$data_path/.cache" install --upgrade mysqlclient
+
 # upgrade homeassistant python package
 pip --cache-dir "$data_path/.cache" install --upgrade $app
 

manifest.json

@@ -1,47 +1,47 @@
 {
-  "name": "Home Assistant",
+    "name": "Home Assistant",
-  "id": "homeassistant",
+    "id": "homeassistant",
-  "packaging_format": 1,
+    "packaging_format": 1,
-   "description": {
+    "description": {
-    "en": "Home automation platform",
+        "en": "Home automation platform",
-    "fr": "Plateforme domotique"
+        "fr": "Plateforme domotique"
-  },
+    },
-  "version": "2021.12.8~ynh1",
+    "version": "2021.12.10~ynh1",
-  "url": "https://github.com/home-assistant/home-assistant",
+    "url": "https://github.com/home-assistant/home-assistant",
-  "upstream": {
+    "upstream": {
+        "license": "Apache-2.0",
+        "website": "https://www.home-assistant.io",
+        "demo": "https://demo.home-assistant.io",
+        "admindoc": "https://www.home-assistant.io/docs/",
+        "code": "https://github.com/home-assistant/core"
+    },
     "license": "Apache-2.0",
-    "website": "https://www.home-assistant.io",
+    "maintainer": {
-    "demo": "https://demo.home-assistant.io",
+        "name": "ewilly",
-    "admindoc": "https://www.home-assistant.io/docs/",
+        "email": "ewilly@ewilly.fr"
-    "code": "https://github.com/home-assistant/core"
+    },
-  },
+    "requirements": {
-  "license": "Apache-2.0",
-  "maintainer": {
-    "name": "ewilly",
-    "email": "ewilly@ewilly.fr"
-  },
-  "requirements": {
         "yunohost": ">= 4.3.0"
-  },
+    },
-  "multi_instance": false,
+    "multi_instance": false,
-  "services": [
+    "services": [
-      "nginx"
+        "nginx"
-  ],
+    ],
-  "arguments": {
+    "arguments": {
-    "install": [
+        "install": [
-      {
+            {
-        "name": "domain",
+                "name": "domain",
-        "type": "domain"
+                "type": "domain"
-      },
+            },
-      {
+            {
-        "name": "is_public",
+                "name": "is_public",
-        "type": "boolean",
+                "type": "boolean",
-        "help": {
+                "help": {
-          "en": "If not public, Smartphone app will not work",
+                    "en": "If not public, Smartphone app will not work",
-          "fr": "Dans le cas contraire, l'application sur Smartphone ne fonctionnera pas"
+                    "fr": "Dans le cas contraire, l'application sur Smartphone ne fonctionnera pas"
-        },
+                },
-        "default": true
+                "default": true
-      }
+            }
-    ]
+        ]
-  }
+    }
 }

scripts/_common.sh

@@ -5,7 +5,7 @@
 #=================================================
 
 # Release to install
-app_version=2021.12.8
+app_version=2021.12.10
 
 # Package dependencies
 pkg_dependencies="python3 python3-dev python3-venv python3-pip libffi-dev libssl-dev libjpeg-dev zlib1g-dev autoconf build-essential libopenjp2-7 libtiff5 libturbojpeg0 libmariadb-dev libmariadb-dev-compat"