From 1721bbebe2d78887e827f0aceda38d768f641ed6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 31 May 2025 23:55:50 +0200 Subject: [PATCH 01/11] Update dependency pytest-asyncio to v1 (#433) * Update dependency pytest-asyncio to v1 * set version to 0.15.0 * Update dependency pytest-asyncio to v1 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stefan Allius --- CHANGELOG.md | 6 ++++-- app/.version | 2 +- app/requirements-test.txt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87342ad..85c6931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,14 +5,16 @@ 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] + +- Update dependency pytest-asyncio to v1 + ## [0.14.1] - 2025-05-31 - handle missing MQTT addon [#438](https://github.com/s-allius/tsun-gen3-proxy/issues/438) ## [0.14.0] - 2025-05-29 -## [0.14.0] - 2025-05-29 - - add-on: bump python to version 3.12.10-r1 - set no of pv modules for MS800 GEN3PLUS inverters - fix the paths to copy the config.example.toml file during proxy start diff --git a/app/.version b/app/.version index c39e9c5..7092c7c 100644 --- a/app/.version +++ b/app/.version @@ -1 +1 @@ -0.14.1 \ No newline at end of file +0.15.0 \ No newline at end of file diff --git a/app/requirements-test.txt b/app/requirements-test.txt index 4f3a0b0..6f50b7f 100644 --- a/app/requirements-test.txt +++ b/app/requirements-test.txt @@ -1,6 +1,6 @@ flake8==7.2.0 pytest==8.3.5 - pytest-asyncio==0.26.0 + pytest-asyncio==1.0.0 pytest-cov==6.1.1 python-dotenv==1.1.0 mock==5.2.0 From 01e9e7095710281a568eda8d8a605f05cc79676a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 22:11:37 +0200 Subject: [PATCH 02/11] Update dependency pytest to v8.4.0 (#444) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/requirements-test.txt b/app/requirements-test.txt index 6f50b7f..3b71af8 100644 --- a/app/requirements-test.txt +++ b/app/requirements-test.txt @@ -1,5 +1,5 @@ flake8==7.2.0 - pytest==8.3.5 + pytest==8.4.0 pytest-asyncio==1.0.0 pytest-cov==6.1.1 python-dotenv==1.1.0 From 8d93b2a636e55078f310ea35953da7e882593597 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 22:12:01 +0200 Subject: [PATCH 03/11] Update python Docker tag to v3.13.4 (#446) 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..0d9339e 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.13.2 +3.13.4 From e59529adc02c5e26238a192662f2d8ea3595cee3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 22:13:41 +0200 Subject: [PATCH 04/11] Update dependency pytest-cov to v6.2.1 (#449) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/requirements-test.txt b/app/requirements-test.txt index 3b71af8..05bb24a 100644 --- a/app/requirements-test.txt +++ b/app/requirements-test.txt @@ -1,7 +1,7 @@ flake8==7.2.0 pytest==8.4.0 pytest-asyncio==1.0.0 - pytest-cov==6.1.1 + pytest-cov==6.2.1 python-dotenv==1.1.0 mock==5.2.0 coverage==7.8.2 From dc1a28260e0398eba108fcbe303eec564b6ba0ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 22:16:56 +0200 Subject: [PATCH 05/11] Update dependency coverage to v7.9.0 (#450) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/requirements-test.txt b/app/requirements-test.txt index 05bb24a..32ce135 100644 --- a/app/requirements-test.txt +++ b/app/requirements-test.txt @@ -4,5 +4,5 @@ pytest-cov==6.2.1 python-dotenv==1.1.0 mock==5.2.0 - coverage==7.8.2 + coverage==7.9.0 jinja2-cli==0.8.2 \ No newline at end of file From 144c9080cbee3b7b144c4c72dee4c9e9fe2745d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 15 Jun 2025 22:43:00 +0200 Subject: [PATCH 06/11] Update dependency coverage to v7.9.1 (#454) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/requirements-test.txt b/app/requirements-test.txt index 32ce135..08a0aaf 100644 --- a/app/requirements-test.txt +++ b/app/requirements-test.txt @@ -4,5 +4,5 @@ pytest-cov==6.2.1 python-dotenv==1.1.0 mock==5.2.0 - coverage==7.9.0 + coverage==7.9.1 jinja2-cli==0.8.2 \ No newline at end of file From 460db31fa69471cbc36eecd77eed78c2ec12581b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 10:46:35 +0200 Subject: [PATCH 07/11] Update python Docker tag to v3.13.5 (#453) 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 0d9339e..86f8c02 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.13.4 +3.13.5 From f3c22c98531b47f33c41ec2c3669bf9c2f45ce32 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 10:51:02 +0200 Subject: [PATCH 08/11] Update dependency pytest to v8.4.1 (#458) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/requirements-test.txt b/app/requirements-test.txt index 08a0aaf..77b0b72 100644 --- a/app/requirements-test.txt +++ b/app/requirements-test.txt @@ -1,5 +1,5 @@ flake8==7.2.0 - pytest==8.4.0 + pytest==8.4.1 pytest-asyncio==1.0.0 pytest-cov==6.2.1 python-dotenv==1.1.0 From 04fd9ed7f6d5d8754a81af93f6276a8495f937c5 Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Sat, 21 Jun 2025 10:26:17 +0200 Subject: [PATCH 09/11] S allius/issue460 (#461) * - Improve Makefile * - Babel don't build new po file if only the pot creation-date was changed --- CHANGELOG.md | 2 ++ Makefile | 30 ++++++++++++++++++++---------- app/Makefile | 2 +- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85c6931..64b02ee 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] +- Babel don't build new po file if only the pot creation-date was changed +- Improve Makefile - Update dependency pytest-asyncio to v1 ## [0.14.1] - 2025-05-31 diff --git a/Makefile b/Makefile index 5964e6e..394ac69 100644 --- a/Makefile +++ b/Makefile @@ -1,27 +1,37 @@ -.PHONY: build babel clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install +.PHONY: help build babel clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install -babel: +help: ## show help message + @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[$$()% a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) + +babel: ## build language files $(MAKE) -C app $@ build: $(MAKE) -C ha_addons $@ -clean: +clean: ## delete all built files $(MAKE) -C app $@ $(MAKE) -C ha_addons $@ -debug dev preview rc rel: +debug dev preview rc rel: ## build docker container in version $(MAKE) -C app babel $(MAKE) -C app $@ -addon-dev addon-debug addon-rc addon-rel: +addon-dev addon-debug addon-rc addon-rel: ## build HA add-on in version $(MAKE) -C app babel $(MAKE) -C ha_addons $(patsubst addon-%,%,$@) -check-docker-compose: +check-docker-compose: ## check the docker-compose file docker-compose config -q -install: - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements.txt - python3 -m pip install -r requirements-test.txt \ No newline at end of file +PY_VER := $(shell cat .python-version) + +install: ## install requirements into the pyenv and switch to proper venv + @pyenv local $(PY_VER) || { pyenv install $(PY_VER) && pyenv local $(PY_VER) || exit 1; } + @pyenv exec pip install --upgrade pip + @pyenv exec pip install -r requirements.txt + @pyenv exec pip install -r requirements-test.txt + pyenv exec python --version + +run: ## run proxy locally out of the actual venv + pyenv exec python app/src/server.py -c /app/src/cnf \ No newline at end of file diff --git a/app/Makefile b/app/Makefile index 29be248..c192556 100644 --- a/app/Makefile +++ b/app/Makefile @@ -55,7 +55,7 @@ $(BABEL_TRANSLATIONS)/%.pot : $(SRC)/.babel.cfg $(BABEL_INPUT) $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po : $(BABEL_TRANSLATIONS)/messages.pot @mkdir -p $(@D) - @pybabel update --init-missing -i $< -d $(BABEL_TRANSLATIONS) -l $* + @pybabel update --init-missing --ignore-pot-creation-date -i $< -d $(BABEL_TRANSLATIONS) -l $* $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.mo : $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po @pybabel compile -d $(BABEL_TRANSLATIONS) -l $* From ebbb675e63f5bb5eb98c55e02dc2c6378083ac14 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Jun 2025 10:27:45 +0200 Subject: [PATCH 10/11] Update dependency flake8 to v7.3.0 (#459) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/requirements-test.txt b/app/requirements-test.txt index 77b0b72..add2d3c 100644 --- a/app/requirements-test.txt +++ b/app/requirements-test.txt @@ -1,4 +1,4 @@ - flake8==7.2.0 + flake8==7.3.0 pytest==8.4.1 pytest-asyncio==1.0.0 pytest-cov==6.2.1 From bacebbd64951ffd451c4058b0cb30d05c21a1c6e Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Sat, 21 Jun 2025 10:41:47 +0200 Subject: [PATCH 11/11] S allius/issue456 (#462) * - remove unused 32-bit architectures from the prebuild multiarch containers * update po file --- CHANGELOG.md | 1 + app/docker-bake.hcl | 2 +- app/translations/de/LC_MESSAGES/messages.po | 1 + ha_addons/docker-bake.hcl | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64b02ee..75c26ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +- remove unused 32-bit architectures - Babel don't build new po file if only the pot creation-date was changed - Improve Makefile - Update dependency pytest-asyncio to v1 diff --git a/app/docker-bake.hcl b/app/docker-bake.hcl index ba9d92b..324a68e 100644 --- a/app/docker-bake.hcl +++ b/app/docker-bake.hcl @@ -53,7 +53,7 @@ target "_common" { ] no-cache = false - platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"] + platforms = ["linux/amd64", "linux/arm64"] } target "_debug" { diff --git a/app/translations/de/LC_MESSAGES/messages.po b/app/translations/de/LC_MESSAGES/messages.po index da4c5b2..85c6c76 100644 --- a/app/translations/de/LC_MESSAGES/messages.po +++ b/app/translations/de/LC_MESSAGES/messages.po @@ -120,6 +120,7 @@ msgid "TSUN Proxy - Log Files" msgstr "TSUN Proxy - Log Dateien" #: src/web/templates/page_logging.html.j2:10 +#, python-format msgid "Do you really want to delete the log file:
%(file)s ?" msgstr "Soll die Datei:
%(file)s
wirklich gelöscht werden?" diff --git a/ha_addons/docker-bake.hcl b/ha_addons/docker-bake.hcl index 32cbf6c..4317a70 100644 --- a/ha_addons/docker-bake.hcl +++ b/ha_addons/docker-bake.hcl @@ -59,7 +59,7 @@ target "_common" { ] no-cache = false - platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"] + platforms = ["linux/amd64", "linux/arm64"] } target "_debug" {