From 04da7f1670c25f0d8b24b8e709fe6314e5c6637c Mon Sep 17 00:00:00 2001 From: ewilly Date: Sat, 7 Oct 2023 10:32:40 +0200 Subject: [PATCH 1/8] Remove old python directories before recreating them --- manifest.toml | 2 +- scripts/_common.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ca0b222..31dcc57 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Home Assistant" description.en = "Home automation platform" description.fr = "Plateforme domotique" -version = "2023.10.1~ynh1" +version = "2023.10.1~ynh2" maintainers = ["ewilly"] diff --git a/scripts/_common.sh b/scripts/_common.sh index 7d7a910..8e9e576 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -149,6 +149,10 @@ myynh_upgrade_venv_directory () { # Remove old python links before recreating them find "$install_dir/bin/" -type l -name 'python*' -exec bash -c 'rm -f "$1"' _ {} \; + # Remove old python directories before recreating them + find "$install_dir/lib/" -mindepth 1 -maxdepth 1 -type d -name "python*" -not -path "*/python${py_required_version%.*}" -exec bash -c 'rm -Rf "$1"' _ {} \; + find "$install_dir/include/site/" -mindepth 1 -maxdepth 1 -type d -name "python*" -not -path "*/python${py_required_version%.*}" -exec bash -c 'rm -Rf "$1"' _ {} \; + # Upgrade the virtual environment directory ynh_exec_as $app $py_app_version -m venv --upgrade "$install_dir" } From 171aca7e88f522a713e461af3801ecf186b4b0cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 7 Oct 2023 08:32:52 +0000 Subject: [PATCH 2/8] 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 a085f1b..2eeb16c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Open source home automation that puts local control and privacy first. Powered b - Home Energy Management." -**Shipped version:** 2023.10.1~ynh1 +**Shipped version:** 2023.10.1~ynh2 **Demo:** https://demo.home-assistant.io diff --git a/README_fr.md b/README_fr.md index 5b10aa5..74834cb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Open source home automation that puts local control and privacy first. Powered b - Home Energy Management." -**Version incluse :** 2023.10.1~ynh1 +**Version incluse :** 2023.10.1~ynh2 **Démo :** https://demo.home-assistant.io From ffb6ab806aa5217a1b587c3df5053d695fa235bf Mon Sep 17 00:00:00 2001 From: ewilly Date: Tue, 10 Oct 2023 21:19:16 +0200 Subject: [PATCH 3/8] Update workflow --- .github/workflows/updater.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 392e0ec..9025c00 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -51,4 +51,5 @@ jobs: title: 'Upgrade to version ${{ env.VERSION }}' body: | Upgrade to v${{ env.VERSION }} + [See upstream release page](https://github.com/home-assistant/core/releases/tag/${{ env.UPSTREAM_VERSION }}) draft: false From 9ab841327de73a3160443797b35f35ef59edaa55 Mon Sep 17 00:00:00 2001 From: ewilly Date: Wed, 11 Oct 2023 20:34:08 +0200 Subject: [PATCH 4/8] Fix linter issue --- scripts/_common.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 8e9e576..abe77d9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -147,11 +147,16 @@ myynh_install_homeassistant () { myynh_upgrade_venv_directory () { # Remove old python links before recreating them - find "$install_dir/bin/" -type l -name 'python*' -exec bash -c 'rm -f "$1"' _ {} \; + find "$install_dir/bin/" -type l -name 'python*' \ + -exec bash -c 'ynh_secure_remove "$1"' _ {} \; # Remove old python directories before recreating them - find "$install_dir/lib/" -mindepth 1 -maxdepth 1 -type d -name "python*" -not -path "*/python${py_required_version%.*}" -exec bash -c 'rm -Rf "$1"' _ {} \; - find "$install_dir/include/site/" -mindepth 1 -maxdepth 1 -type d -name "python*" -not -path "*/python${py_required_version%.*}" -exec bash -c 'rm -Rf "$1"' _ {} \; + find "$install_dir/lib/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ + -not -path "*/python${py_required_version%.*}" \ + -exec bash -c 'ynh_secure_remove "$1"' _ {} \; + find "$install_dir/include/site/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ + -not -path "*/python${py_required_version%.*}" \ + -exec bash -c 'ynh_secure_remove "$1"' _ {} \; # Upgrade the virtual environment directory ynh_exec_as $app $py_app_version -m venv --upgrade "$install_dir" From 944d13ef8af6b7a9e5d72ed472e769bbefaa68b4 Mon Sep 17 00:00:00 2001 From: ewilly Date: Thu, 12 Oct 2023 18:35:22 +0200 Subject: [PATCH 5/8] Fix linter issue --- scripts/_common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index abe77d9..7fcff99 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -148,15 +148,15 @@ myynh_upgrade_venv_directory () { # Remove old python links before recreating them find "$install_dir/bin/" -type l -name 'python*' \ - -exec bash -c 'ynh_secure_remove "$1"' _ {} \; + -exec bash -c 'rm --force "$1"' _ {} \; # Remove old python directories before recreating them find "$install_dir/lib/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ -not -path "*/python${py_required_version%.*}" \ - -exec bash -c 'ynh_secure_remove "$1"' _ {} \; + -exec bash -c 'rm --force --recursive "$1"' _ {} \; find "$install_dir/include/site/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ -not -path "*/python${py_required_version%.*}" \ - -exec bash -c 'ynh_secure_remove "$1"' _ {} \; + -exec bash -c 'rm --force --recursive "$1"' _ {} \; # Upgrade the virtual environment directory ynh_exec_as $app $py_app_version -m venv --upgrade "$install_dir" From 6802df329f2ef558b295df846dbe19eace92c52d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Oct 2023 17:47:37 +0000 Subject: [PATCH 6/8] Upgrade to v2023.10.2 --- manifest.toml | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 31dcc57..962e88b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Home Assistant" description.en = "Home automation platform" description.fr = "Plateforme domotique" -version = "2023.10.1~ynh2" +version = "2023.10.2~ynh1" maintainers = ["ewilly"] diff --git a/scripts/_common.sh b/scripts/_common.sh index 7fcff99..addbb5c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Release to install -app_version=2023.10.1 +app_version=2023.10.2 # Requirements py_required_version=3.11.6 From 1e844a9e0e3405571d63c96c4f0c5fcdb1c02495 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Oct 2023 17:47:43 +0000 Subject: [PATCH 7/8] 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 2eeb16c..c7b0a1a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Open source home automation that puts local control and privacy first. Powered b - Home Energy Management." -**Shipped version:** 2023.10.1~ynh2 +**Shipped version:** 2023.10.2~ynh1 **Demo:** https://demo.home-assistant.io diff --git a/README_fr.md b/README_fr.md index 74834cb..6e4a2a3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Open source home automation that puts local control and privacy first. Powered b - Home Energy Management." -**Version incluse :** 2023.10.1~ynh2 +**Version incluse :** 2023.10.2~ynh1 **Démo :** https://demo.home-assistant.io From 46344b84207cc9bff5428947d207784891ddb443 Mon Sep 17 00:00:00 2001 From: ewilly Date: Thu, 12 Oct 2023 21:30:30 +0200 Subject: [PATCH 8/8] Fix workflow --- .github/workflows/updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 9025c00..d18a9e5 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -51,5 +51,5 @@ jobs: title: 'Upgrade to version ${{ env.VERSION }}' body: | Upgrade to v${{ env.VERSION }} - [See upstream release page](https://github.com/home-assistant/core/releases/tag/${{ env.UPSTREAM_VERSION }}) + [See upstream release page](https://github.com/home-assistant/core/releases/tag/${{ env.VERSION }}) draft: false