From 7f42b63eaf069ce44c9981dd080b86795a04126c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:53:22 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20appdaemon=20to=20?= =?UTF-8?q?v4.4.1=20(#247)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- appdaemon/Dockerfile | 1 - appdaemon/requirements.txt | 2 +- appdaemon/rootfs/patches/supervisor.patch | 21 --------------------- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 appdaemon/rootfs/patches/supervisor.patch diff --git a/appdaemon/Dockerfile b/appdaemon/Dockerfile index 16a7fb6..a119b75 100755 --- a/appdaemon/Dockerfile +++ b/appdaemon/Dockerfile @@ -27,7 +27,6 @@ RUN \ \ && cd /usr/lib/python3.10/site-packages/ \ && patch -p1 < /patches/force_recompile.patch \ - && patch -p1 < /patches/supervisor.patch \ \ && find /usr \ \( -type d -a -name test -o -name tests -o -name '__pycache__' \) \ diff --git a/appdaemon/requirements.txt b/appdaemon/requirements.txt index 3972b2f..5c65352 100644 --- a/appdaemon/requirements.txt +++ b/appdaemon/requirements.txt @@ -1 +1 @@ -appdaemon==4.2.3 +appdaemon==4.4.1 diff --git a/appdaemon/rootfs/patches/supervisor.patch b/appdaemon/rootfs/patches/supervisor.patch deleted file mode 100644 index 75ab4a5..0000000 --- a/appdaemon/rootfs/patches/supervisor.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/appdaemon/plugins/hass/hassplugin.py -+++ b/appdaemon/plugins/hass/hassplugin.py -@@ -11,6 +11,7 @@ import datetime - from urllib.parse import quote - from urllib.parse import urlencode - from typing import Union -+import os - - import appdaemon.utils as utils - from appdaemon.appdaemon import AppDaemon -@@ -55,8 +56,8 @@ class HassPlugin(PluginBase): - self.cert_path = args.get("cert_path") - self.cert_verify = args.get("cert_verify") - self.commtype = args.get("commtype", "WS") -- self.ha_key = args.get("ha_key") -- self.ha_url = args.get("ha_url", "") -+ self.ha_key = args.get("ha_key", os.environ.get("SUPERVISOR_TOKEN")) -+ self.ha_url = args.get("ha_url", "http://supervisor/core").rstrip("/") - self.namespace = args.get("namespace", "default") - self.plugin_startup_conditions = args.get("plugin_startup_conditions", {}) - self.retry_secs = int(args.get("retry_secs", 5))