From 31f4f05bed92443aeeb41f687a88c81f86743753 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 20:47:11 +0200 Subject: [PATCH 1/7] Update ghcr.io/hassio-addons/base Docker tag to v17.2.4 (#355) * Update ghcr.io/hassio-addons/base Docker tag to v17.2.3 * Update ghcr.io/hassio-addons/base Docker tag to v17.2.4 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stefan Allius --- ha_addons/ha_addon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ha_addons/ha_addon/Dockerfile b/ha_addons/ha_addon/Dockerfile index 9d3ecdb..1d9df4d 100755 --- a/ha_addons/ha_addon/Dockerfile +++ b/ha_addons/ha_addon/Dockerfile @@ -13,7 +13,7 @@ # 1 Build Base Image # ###################### -ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.3" +ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.4" # hadolint ignore=DL3006 FROM $BUILD_FROM AS base From abe6bfb013701c725eba3cb770aeb98d33566244 Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Thu, 10 Apr 2025 23:58:59 +0200 Subject: [PATCH 2/7] update compose help link (#361) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e1102d..dfd39a8 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ No special configuration is required for the Docker container if it is built and On the host, two directories (for log files and for config files) must be mapped. If necessary, the UID of the proxy process can be adjusted, which is also the owner of the log and configuration files. -A description of the configuration parameters can be found [here](https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-toml#docker-compose-environment-variables). +A description of the configuration parameters can be found [here](https://github.com/s-allius/tsun-gen3-proxy/wiki/configuration-env#docker-compose-environment-variables) ## Proxy Configuration From 83a723c959b446962c29a5617e8eca164a2820ac Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Sun, 13 Apr 2025 19:59:05 +0200 Subject: [PATCH 3/7] Update rel 0.13.0 (#367) * fix link (cherry picked from commit 3d422f924957dd860f1f03599bb8d3b70428e32b) * update compose help link (cherry picked from commit 6d4ff0d5089bec6dbb6ae2d37aa3a4db80ef1f25) * fix link (cherry picked from commit 3d422f924957dd860f1f03599bb8d3b70428e32b) * fix rel build run --- ha_addons/ha_addon/DOCS.md | 6 +++--- ha_addons/templates/rel_data.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ha_addons/ha_addon/DOCS.md b/ha_addons/ha_addon/DOCS.md index d601798..c44c3df 100644 --- a/ha_addons/ha_addon/DOCS.md +++ b/ha_addons/ha_addon/DOCS.md @@ -50,7 +50,7 @@ Example add-on configuration after installation: ```yaml inverters: - - serial: R17E760702080400 + - serial: R17E000000000000 node_id: PV-Garage suggested_area: Garage modbus_polling: false @@ -89,7 +89,7 @@ Example add-on configuration for GEN3PLUS energie storages: ```yaml batteries: - serial: 4100000000000000 - monitor_sn: 2300000000 + monitor_sn: 3000000000 node_id: bat_1 suggested_area: Garage modbus_polling: false @@ -174,4 +174,4 @@ SOFTWARE. [AdGuard]: https://github.com/hassio-addons/addon-adguard-home [repository-badge]: https://img.shields.io/badge/Add%20repository%20to%20my-Home%20Assistant-41BDF5?logo=home-assistant&style=for-the-badge [repository-url]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fs-allius%2Fha-addons -[configdetails]: https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-toml +[configdetails]: https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-addon diff --git a/ha_addons/templates/rel_data.json b/ha_addons/templates/rel_data.json index edf673c..6bb9b2b 100644 --- a/ha_addons/templates/rel_data.json +++ b/ha_addons/templates/rel_data.json @@ -6,6 +6,6 @@ "slug": "tsun-proxy", "advanced": false, "stage": "stable", - "readme_dsecr": "Integrates TSUN inverters (e.g. TSOL MS800, MS2000, MS3000) and batteries (TSOL DC1000) into Home Assistant.\n\nIt is based on the [TSUN Proxy][tsunproxy] and enables a reliable connection between TSUN devices and an MQTT broker.\n\nWith the Add-on, you can easily retrieve real-time values such as power, current and daily energy and integrate the inverter into Home Assistant.\nThis works even without an internet connection.\n\nThe optional connection to the TSUN Cloud can be disabled!", + "readme_descr": "Integrates TSUN inverters (e.g. TSOL MS800, MS2000, MS3000) and batteries (TSOL DC1000) into Home Assistant.\n\nIt is based on the [TSUN Proxy][tsunproxy] and enables a reliable connection between TSUN devices and an MQTT broker.\n\nWith the Add-on, you can easily retrieve real-time values such as power, current and daily energy and integrate the inverter into Home Assistant.\nThis works even without an internet connection.\n\nThe optional connection to the TSUN Cloud can be disabled!", "readme_links": "\n[tsunproxy]: https://github.com/s-allius/tsun-gen3-proxy\n" } \ No newline at end of file From fe250d478ae7b6a8233c39145548f9936e13152f Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Sun, 13 Apr 2025 20:35:21 +0200 Subject: [PATCH 4/7] Fix rel build (#368) * fix rel build run * disable cache for rc build * bump python version to 3.12.10-r0 --- ha_addons/docker-bake.hcl | 1 + ha_addons/ha_addon/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ha_addons/docker-bake.hcl b/ha_addons/docker-bake.hcl index 9c87499..32cbf6c 100644 --- a/ha_addons/docker-bake.hcl +++ b/ha_addons/docker-bake.hcl @@ -90,6 +90,7 @@ target "preview" { target "rc" { inherits = ["_common", "_prod"] tags = ["${IMAGE}:rc", "${IMAGE}:${VERSION}"] + no-cache = true } target "rel" { diff --git a/ha_addons/ha_addon/Dockerfile b/ha_addons/ha_addon/Dockerfile index 1d9df4d..0529d5b 100755 --- a/ha_addons/ha_addon/Dockerfile +++ b/ha_addons/ha_addon/Dockerfile @@ -18,7 +18,7 @@ ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.4" FROM $BUILD_FROM AS base # Installiere Python, pip und virtuelle Umgebungstools -RUN apk add --no-cache python3=3.12.9-r0 py3-pip=24.3.1-r0 && \ +RUN apk add --no-cache python3=3.12.10-r0 py3-pip=24.3.1-r0 && \ python -m venv /opt/venv && \ . /opt/venv/bin/activate From aac89065fd95bd008c9486fc1374d9cbc9f44c1d Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Sun, 13 Apr 2025 20:56:10 +0200 Subject: [PATCH 5/7] Update rel 0.13.0 (#370) * bump version --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31ac310..6f194c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +## [0.13.0] - 2025-04-13 + - update dependency python to 3.13 - add initial support for TSUN MS-3000 - add initial apparmor support [#293](https://github.com/s-allius/tsun-gen3-proxy/issues/293) From 4a70f366f1a9d6ff4ef02b174a5905c03215027e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 13 Apr 2025 23:38:38 +0200 Subject: [PATCH 6/7] Update dependency aiomqtt to v2.3.2 (#358) * Update dependency aiomqtt to v2.3.2 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stefan Allius --- CHANGELOG.md | 2 +- app/requirements.txt | 2 +- ha_addons/Makefile | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f194c0..3057d9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [unreleased] +## [0.13.0] - 2025-04-13 ## [0.13.0] - 2025-04-13 diff --git a/app/requirements.txt b/app/requirements.txt index 565a34d..5bd1ce5 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,4 +1,4 @@ - aiomqtt==2.3.1 + aiomqtt==2.3.2 schema==0.7.7 aiocron==2.1 aiohttp==3.11.16 \ No newline at end of file diff --git a/ha_addons/Makefile b/ha_addons/Makefile index ab162c4..a8e08f4 100644 --- a/ha_addons/Makefile +++ b/ha_addons/Makefile @@ -33,6 +33,7 @@ rel : STAGE=rel export BUILD_DATE := ${shell date -Iminutes} BUILD_ID := ${shell date +'%y%m%d%H%M'} +rel : BUILD_ID= VERSION := $(shell cat $(SRC)/.version) export MAJOR := $(shell echo $(VERSION) | cut -f1 -d.) From 5568a017ecc9b2c22ddd9702092691003a5bc9be Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 13 Apr 2025 23:39:44 +0200 Subject: [PATCH 7/7] Update python Docker tag to v3.13.3 (#359) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .python-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.python-version b/.python-version index 3e388a4..2c20ac9 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.13.2 +3.13.3