From 7193e82963bd4c4d8537423c1d136b7a621e4e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Thu, 2 Sep 2021 11:40:32 +0200 Subject: [PATCH 1/6] Bump pyuptimerobot to 21.9.0 (#55546) --- homeassistant/components/uptimerobot/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/uptimerobot/manifest.json b/homeassistant/components/uptimerobot/manifest.json index 279bf6eb43e..66b1dc9abe4 100644 --- a/homeassistant/components/uptimerobot/manifest.json +++ b/homeassistant/components/uptimerobot/manifest.json @@ -3,7 +3,7 @@ "name": "Uptime Robot", "documentation": "https://www.home-assistant.io/integrations/uptimerobot", "requirements": [ - "pyuptimerobot==21.8.2" + "pyuptimerobot==21.9.0" ], "codeowners": [ "@ludeeus" diff --git a/requirements_all.txt b/requirements_all.txt index ee9f09d69ce..24793de6687 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1968,7 +1968,7 @@ pytrafikverket==0.1.6.2 pyudev==0.22.0 # homeassistant.components.uptimerobot -pyuptimerobot==21.8.2 +pyuptimerobot==21.9.0 # homeassistant.components.keyboard # pyuserinput==0.1.11 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index e83fdc13817..23926a1a747 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1109,7 +1109,7 @@ pytradfri[async]==7.0.6 pyudev==0.22.0 # homeassistant.components.uptimerobot -pyuptimerobot==21.8.2 +pyuptimerobot==21.9.0 # homeassistant.components.vera pyvera==0.3.13 From 6aa771e5e826bd5bd1bd7b414d0fd93f7e2d26c6 Mon Sep 17 00:00:00 2001 From: Teemu R Date: Thu, 2 Sep 2021 00:18:12 +0200 Subject: [PATCH 2/6] xiaomi_miio: bump python-miio dependency (#55549) --- homeassistant/components/xiaomi_miio/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/xiaomi_miio/manifest.json b/homeassistant/components/xiaomi_miio/manifest.json index 18aa7f75ce1..28f3c2da0c5 100644 --- a/homeassistant/components/xiaomi_miio/manifest.json +++ b/homeassistant/components/xiaomi_miio/manifest.json @@ -3,7 +3,7 @@ "name": "Xiaomi Miio", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/xiaomi_miio", - "requirements": ["construct==2.10.56", "micloud==0.3", "python-miio==0.5.7"], + "requirements": ["construct==2.10.56", "micloud==0.3", "python-miio==0.5.8"], "codeowners": ["@rytilahti", "@syssi", "@starkillerOG", "@bieniu"], "zeroconf": ["_miio._udp.local."], "iot_class": "local_polling" diff --git a/requirements_all.txt b/requirements_all.txt index 24793de6687..c09604740ab 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1880,7 +1880,7 @@ python-juicenet==1.0.2 # python-lirc==1.2.3 # homeassistant.components.xiaomi_miio -python-miio==0.5.7 +python-miio==0.5.8 # homeassistant.components.mpd python-mpd2==3.0.4 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 23926a1a747..67e30937a72 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1067,7 +1067,7 @@ python-izone==1.1.6 python-juicenet==1.0.2 # homeassistant.components.xiaomi_miio -python-miio==0.5.7 +python-miio==0.5.8 # homeassistant.components.nest python-nest==4.1.0 From 8f85472df3861304b21bb07fadbfc5693ba73752 Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Wed, 1 Sep 2021 22:54:35 -0400 Subject: [PATCH 3/6] Pick right coordinator (#55555) --- homeassistant/components/zha/core/gateway.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/zha/core/gateway.py b/homeassistant/components/zha/core/gateway.py index d093c02d568..50da16802b3 100644 --- a/homeassistant/components/zha/core/gateway.py +++ b/homeassistant/components/zha/core/gateway.py @@ -174,7 +174,7 @@ class ZHAGateway: """Restore ZHA devices from zigpy application state.""" for zigpy_device in self.application_controller.devices.values(): zha_device = self._async_get_or_create_device(zigpy_device, restored=True) - if zha_device.nwk == 0x0000: + if zha_device.ieee == self.application_controller.ieee: self.coordinator_zha_device = zha_device zha_dev_entry = self.zha_storage.devices.get(str(zigpy_device.ieee)) delta_msg = "not known" From 89b7be52af8d4d1194e8d683f84341cbe7ca254c Mon Sep 17 00:00:00 2001 From: jan iversen Date: Thu, 2 Sep 2021 13:53:38 +0200 Subject: [PATCH 4/6] Correct duplicate address. (#55578) --- homeassistant/components/modbus/validators.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/modbus/validators.py b/homeassistant/components/modbus/validators.py index fdfffaebd61..a4177a7ff30 100644 --- a/homeassistant/components/modbus/validators.py +++ b/homeassistant/components/modbus/validators.py @@ -10,6 +10,8 @@ import voluptuous as vol from homeassistant.const import ( CONF_ADDRESS, + CONF_COMMAND_OFF, + CONF_COMMAND_ON, CONF_COUNT, CONF_HOST, CONF_NAME, @@ -201,15 +203,19 @@ def scan_interval_validator(config: dict) -> dict: def duplicate_entity_validator(config: dict) -> dict: """Control scan_interval.""" for hub_index, hub in enumerate(config): - addresses: set[str] = set() for component, conf_key in PLATFORMS: if conf_key not in hub: continue names: set[str] = set() errors: list[int] = [] + addresses: set[str] = set() for index, entry in enumerate(hub[conf_key]): name = entry[CONF_NAME] addr = str(entry[CONF_ADDRESS]) + if CONF_COMMAND_ON in entry: + addr += "_" + str(entry[CONF_COMMAND_ON]) + if CONF_COMMAND_OFF in entry: + addr += "_" + str(entry[CONF_COMMAND_OFF]) if CONF_SLAVE in entry: addr += "_" + str(entry[CONF_SLAVE]) if addr in addresses: From 1592408a4be7d096c14e478de3bcbebf19d46da9 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 2 Sep 2021 18:09:30 +0200 Subject: [PATCH 5/6] Downgrade sqlite-libs on docker image (#55591) --- Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6bcb080a06e..c802ba9b273 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,21 @@ RUN \ -e ./homeassistant \ && python3 -m compileall homeassistant/homeassistant +# Fix Bug with Alpine 3.14 and sqlite 3.35 +# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12524 +ARG BUILD_ARCH +RUN \ + if [ "${BUILD_ARCH}" = "amd64" ]; then \ + export APK_ARCH=x86_64; \ + elif [ "${BUILD_ARCH}" = "i386" ]; then \ + export APK_ARCH=x86; \ + else \ + export APK_ARCH=${BUILD_ARCH}; \ + fi \ + && curl -O http://dl-cdn.alpinelinux.org/alpine/v3.13/main/${APK_ARCH}/sqlite-libs-3.34.1-r0.apk \ + && apk add --no-cache sqlite-libs-3.34.1-r0.apk \ + && rm -f sqlite-libs-3.34.1-r0.apk + # Home Assistant S6-Overlay COPY rootfs / From 5b705dba36739a69beeb0ba09de858e96d65d8ba Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 2 Sep 2021 12:50:56 -0700 Subject: [PATCH 6/6] Bumped version to 2021.9.1 --- homeassistant/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/const.py b/homeassistant/const.py index 9cd5ecc4fec..1ec5ae0e311 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -5,7 +5,7 @@ from typing import Final MAJOR_VERSION: Final = 2021 MINOR_VERSION: Final = 9 -PATCH_VERSION: Final = "0" +PATCH_VERSION: Final = "1" __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}" __version__: Final = f"{__short_version__}.{PATCH_VERSION}" REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 8, 0)