From ec7302ef1bf8880f583adfcb261d31c06c8d9f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BCndig?= Date: Thu, 8 Dec 2022 14:23:25 +0100 Subject: [PATCH 01/15] Set connectable as false for sensirion_ble (#83481) This is a passive ble integration. Not setting it as false means it won't match properly when using through a passive remote scanner. --- homeassistant/components/sensirion_ble/manifest.json | 2 ++ homeassistant/generated/bluetooth.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/homeassistant/components/sensirion_ble/manifest.json b/homeassistant/components/sensirion_ble/manifest.json index f13f393a844..a3011639d3e 100644 --- a/homeassistant/components/sensirion_ble/manifest.json +++ b/homeassistant/components/sensirion_ble/manifest.json @@ -5,9 +5,11 @@ "documentation": "https://www.home-assistant.io/integrations/sensirion_ble", "bluetooth": [ { + "connectable": false, "manufacturer_id": 1749 }, { + "connectable": false, "local_name": "MyCO2*" } ], diff --git a/homeassistant/generated/bluetooth.py b/homeassistant/generated/bluetooth.py index 922e754e84a..42bea46086e 100644 --- a/homeassistant/generated/bluetooth.py +++ b/homeassistant/generated/bluetooth.py @@ -273,10 +273,12 @@ BLUETOOTH: list[dict[str, bool | str | int | list[int]]] = [ "local_name": "Ruuvi *", }, { + "connectable": False, "domain": "sensirion_ble", "manufacturer_id": 1749, }, { + "connectable": False, "domain": "sensirion_ble", "local_name": "MyCO2*", }, From f4948e8f48676929b842c7ace0349d6fb2ca2be3 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 8 Dec 2022 02:21:55 +0100 Subject: [PATCH 02/15] Make sure super async_added_to_hass is called (#83493) Make sure super added to hass is called --- homeassistant/components/philips_js/media_player.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/homeassistant/components/philips_js/media_player.py b/homeassistant/components/philips_js/media_player.py index 04e63008e7b..d9ea06c2f2c 100644 --- a/homeassistant/components/philips_js/media_player.py +++ b/homeassistant/components/philips_js/media_player.py @@ -101,6 +101,8 @@ class PhilipsTVMediaPlayer( async def async_added_to_hass(self) -> None: """Handle being added to hass.""" + await super().async_added_to_hass() + if (entry := self.registry_entry) and entry.device_id: self.async_on_remove( self._turn_on.async_register( From 94160903a74fb093c8edfebb184b2137be6da5e9 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Wed, 7 Dec 2022 19:54:58 -0700 Subject: [PATCH 03/15] Bump `simplisafe-python` to 2022.12.0 (#83497) --- homeassistant/components/simplisafe/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/simplisafe/manifest.json b/homeassistant/components/simplisafe/manifest.json index 99c332955c3..3db4ec9e8ac 100644 --- a/homeassistant/components/simplisafe/manifest.json +++ b/homeassistant/components/simplisafe/manifest.json @@ -3,7 +3,7 @@ "name": "SimpliSafe", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/simplisafe", - "requirements": ["simplisafe-python==2022.11.2"], + "requirements": ["simplisafe-python==2022.12.0"], "codeowners": ["@bachya"], "iot_class": "cloud_polling", "dhcp": [ diff --git a/requirements_all.txt b/requirements_all.txt index 58decaa1158..44d8672f2ab 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2291,7 +2291,7 @@ simplehound==0.3 simplepush==2.1.1 # homeassistant.components.simplisafe -simplisafe-python==2022.11.2 +simplisafe-python==2022.12.0 # homeassistant.components.sisyphus sisyphus-control==3.1.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 4f1a6bc31bf..d4979c807e4 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1588,7 +1588,7 @@ simplehound==0.3 simplepush==2.1.1 # homeassistant.components.simplisafe -simplisafe-python==2022.11.2 +simplisafe-python==2022.12.0 # homeassistant.components.slack slackclient==2.5.0 From a64e56c8adbdda9f4fd0241c7e42034d0ad27a41 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Thu, 8 Dec 2022 01:31:44 +0100 Subject: [PATCH 04/15] Bump python-matter-server to 1.0.7 (#83507) --- homeassistant/components/matter/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/matter/manifest.json b/homeassistant/components/matter/manifest.json index aa64ac4755e..280a6b38da5 100644 --- a/homeassistant/components/matter/manifest.json +++ b/homeassistant/components/matter/manifest.json @@ -3,7 +3,7 @@ "name": "Matter (BETA)", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/matter", - "requirements": ["python-matter-server==1.0.6"], + "requirements": ["python-matter-server==1.0.7"], "dependencies": ["websocket_api"], "codeowners": ["@MartinHjelmare", "@marcelveldt"], "iot_class": "local_push" diff --git a/requirements_all.txt b/requirements_all.txt index 44d8672f2ab..e65d8da8002 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2030,7 +2030,7 @@ python-kasa==0.5.0 # python-lirc==1.2.3 # homeassistant.components.matter -python-matter-server==1.0.6 +python-matter-server==1.0.7 # homeassistant.components.xiaomi_miio python-miio==0.5.12 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index d4979c807e4..4c867e0d289 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1417,7 +1417,7 @@ python-juicenet==1.1.0 python-kasa==0.5.0 # homeassistant.components.matter -python-matter-server==1.0.6 +python-matter-server==1.0.7 # homeassistant.components.xiaomi_miio python-miio==0.5.12 From b7396a736ec3d898e3fc58a404cc7834f520817a Mon Sep 17 00:00:00 2001 From: mezz64 <2854333+mezz64@users.noreply.github.com> Date: Thu, 8 Dec 2022 13:30:20 -0500 Subject: [PATCH 05/15] Bump pyhik to 0.3.2 (#83517) Increase pyHik version to fix videoloss error --- homeassistant/components/hikvision/manifest.json | 2 +- requirements_all.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/hikvision/manifest.json b/homeassistant/components/hikvision/manifest.json index 4b27e37b0f6..2df3e4b6e64 100644 --- a/homeassistant/components/hikvision/manifest.json +++ b/homeassistant/components/hikvision/manifest.json @@ -2,7 +2,7 @@ "domain": "hikvision", "name": "Hikvision", "documentation": "https://www.home-assistant.io/integrations/hikvision", - "requirements": ["pyhik==0.3.1"], + "requirements": ["pyhik==0.3.2"], "codeowners": ["@mezz64"], "iot_class": "local_push", "loggers": ["pyhik"] diff --git a/requirements_all.txt b/requirements_all.txt index e65d8da8002..d6d8b46af3c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1627,7 +1627,7 @@ pyhaversion==22.8.0 pyheos==0.7.2 # homeassistant.components.hikvision -pyhik==0.3.1 +pyhik==0.3.2 # homeassistant.components.hive pyhiveapi==0.5.14 From 609fc9196fac86adbb9884864668ee9ea57a3919 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Thu, 8 Dec 2022 08:45:21 -0800 Subject: [PATCH 06/15] Bump ical to 4.2.2 (#83520) Co-authored-by: Shay Levy --- homeassistant/components/local_calendar/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/local_calendar/manifest.json b/homeassistant/components/local_calendar/manifest.json index fa258c389ab..2921b3e2e10 100644 --- a/homeassistant/components/local_calendar/manifest.json +++ b/homeassistant/components/local_calendar/manifest.json @@ -3,7 +3,7 @@ "name": "Local Calendar", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/local_calendar", - "requirements": ["ical==4.2.1"], + "requirements": ["ical==4.2.2"], "codeowners": ["@allenporter"], "iot_class": "local_polling", "loggers": ["ical"] diff --git a/requirements_all.txt b/requirements_all.txt index d6d8b46af3c..c57260af2b4 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -926,7 +926,7 @@ ibm-watson==5.2.2 ibmiotf==0.3.4 # homeassistant.components.local_calendar -ical==4.2.1 +ical==4.2.2 # homeassistant.components.ping icmplib==3.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 4c867e0d289..d01f0bb2119 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -691,7 +691,7 @@ iaqualink==0.5.0 ibeacon_ble==1.0.1 # homeassistant.components.local_calendar -ical==4.2.1 +ical==4.2.2 # homeassistant.components.ping icmplib==3.0 From 2cf1235b78d5388b9a65d8fb8824083f5f1b82c4 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Thu, 8 Dec 2022 15:42:40 +0100 Subject: [PATCH 07/15] Fix issue with Callable, Union, and Python 3.9 [mqtt] (#83547) --- homeassistant/components/mqtt/client.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/mqtt/client.py b/homeassistant/components/mqtt/client.py index 36e12c47419..f55b1066420 100644 --- a/homeassistant/components/mqtt/client.py +++ b/homeassistant/components/mqtt/client.py @@ -1,8 +1,11 @@ """Support for MQTT message handling.""" +# pylint: disable=deprecated-typing-alias +# In Python 3.9.0 and 3.9.1 collections.abc.Callable +# can't be used inside typing.Union or typing.Optional from __future__ import annotations import asyncio -from collections.abc import Callable, Coroutine, Iterable +from collections.abc import Coroutine, Iterable from functools import lru_cache, partial, wraps import inspect from itertools import groupby @@ -10,7 +13,7 @@ import logging from operator import attrgetter import ssl import time -from typing import TYPE_CHECKING, Any, Union, cast +from typing import TYPE_CHECKING, Any, Callable, Union, cast import uuid import attr From b548be35bc7e994dacffe186a28a4980ca6c6ad8 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 8 Dec 2022 17:18:39 +0100 Subject: [PATCH 08/15] Update frontend to 20221208.0 (#83551) --- homeassistant/components/frontend/manifest.json | 2 +- homeassistant/package_constraints.txt | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json index 83514976793..57a31456c3c 100644 --- a/homeassistant/components/frontend/manifest.json +++ b/homeassistant/components/frontend/manifest.json @@ -2,7 +2,7 @@ "domain": "frontend", "name": "Home Assistant Frontend", "documentation": "https://www.home-assistant.io/integrations/frontend", - "requirements": ["home-assistant-frontend==20221207.0"], + "requirements": ["home-assistant-frontend==20221208.0"], "dependencies": [ "api", "auth", diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 367eb4f6a8a..04412d26580 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -22,7 +22,7 @@ dbus-fast==1.75.0 fnvhash==0.1.0 hass-nabucasa==0.61.0 home-assistant-bluetooth==1.8.1 -home-assistant-frontend==20221207.0 +home-assistant-frontend==20221208.0 httpx==0.23.1 ifaddr==0.1.7 janus==1.0.0 diff --git a/requirements_all.txt b/requirements_all.txt index c57260af2b4..2e72a7f34a3 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -884,7 +884,7 @@ hole==0.7.0 holidays==0.17.2 # homeassistant.components.frontend -home-assistant-frontend==20221207.0 +home-assistant-frontend==20221208.0 # homeassistant.components.home_connect homeconnect==0.7.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index d01f0bb2119..c529492eb9d 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -664,7 +664,7 @@ hole==0.7.0 holidays==0.17.2 # homeassistant.components.frontend -home-assistant-frontend==20221207.0 +home-assistant-frontend==20221208.0 # homeassistant.components.home_connect homeconnect==0.7.2 From 5994dd558bb2629c6a05f7cb4b5e9108b34def95 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Thu, 8 Dec 2022 13:44:45 -0800 Subject: [PATCH 09/15] Improve local calendar input validation error handling (#83563) --- .../components/local_calendar/calendar.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/local_calendar/calendar.py b/homeassistant/components/local_calendar/calendar.py index 79d16634883..63a2f2b03d2 100644 --- a/homeassistant/components/local_calendar/calendar.py +++ b/homeassistant/components/local_calendar/calendar.py @@ -11,6 +11,8 @@ from ical.calendar_stream import IcsCalendarStream from ical.event import Event from ical.store import EventStore from ical.types import Range, Recur +from pydantic import ValidationError +import voluptuous as vol from homeassistant.components.calendar import ( EVENT_DESCRIPTION, @@ -102,14 +104,19 @@ class LocalCalendarEntity(CalendarEntity): async def async_create_event(self, **kwargs: Any) -> None: """Add a new event to calendar.""" - event = Event.parse_obj( - { - EVENT_SUMMARY: kwargs[EVENT_SUMMARY], - EVENT_START: kwargs[EVENT_START], - EVENT_END: kwargs[EVENT_END], - EVENT_DESCRIPTION: kwargs.get(EVENT_DESCRIPTION), - } - ) + event_data = { + EVENT_SUMMARY: kwargs[EVENT_SUMMARY], + EVENT_START: kwargs[EVENT_START], + EVENT_END: kwargs[EVENT_END], + EVENT_DESCRIPTION: kwargs.get(EVENT_DESCRIPTION), + } + try: + event = Event.parse_obj(event_data) + except ValidationError as err: + _LOGGER.debug( + "Error parsing event input fields: %s (%s)", event_data, str(err) + ) + raise vol.Invalid("Error parsing event input fields") from err if rrule := kwargs.get(EVENT_RRULE): event.rrule = Recur.from_rrule(rrule) From 8ccc77eb3de5a06877645007bf75713550fef6d4 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 8 Dec 2022 16:45:23 -0500 Subject: [PATCH 10/15] Bumped version to 2022.12.1 --- homeassistant/const.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/const.py b/homeassistant/const.py index 70b1f7799e6..3c96f48f6be 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -8,7 +8,7 @@ from .backports.enum import StrEnum APPLICATION_NAME: Final = "HomeAssistant" MAJOR_VERSION: Final = 2022 MINOR_VERSION: Final = 12 -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, 9, 0) diff --git a/pyproject.toml b/pyproject.toml index 3c65b01d26d..a1ae9d9c89a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "homeassistant" -version = "2022.12.0" +version = "2022.12.1" license = {text = "Apache-2.0"} description = "Open-source home automation platform running on Python 3." readme = "README.rst" From 803d4a999886255ceb413d4e088a621a328cf92b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 8 Dec 2022 12:44:33 +0100 Subject: [PATCH 11/15] Bump pip_check conflicts +1 (#83536) * Bump pip_check conflicts +1 * Update script/pip_check Co-authored-by: Philip Allgaier Co-authored-by: Philip Allgaier --- script/pip_check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/pip_check b/script/pip_check index 9ed327b54f4..cbe6a3851e0 100755 --- a/script/pip_check +++ b/script/pip_check @@ -2,8 +2,8 @@ PIP_CACHE=$1 # Number of existing dependency conflicts -# Update if a PR resolve one! -DEPENDENCY_CONFLICTS=3 +# Update if a PR resolves one! +DEPENDENCY_CONFLICTS=4 PIP_CHECK=$(pip check --cache-dir=$PIP_CACHE) LINE_COUNT=$(echo "$PIP_CHECK" | wc -l) From 5cdcbcd5fe9af7b931ddceb3c2c5cba43a961420 Mon Sep 17 00:00:00 2001 From: Jeef Date: Thu, 8 Dec 2022 15:43:41 -0700 Subject: [PATCH 12/15] Bump intellifire4py to 2.2.2 (#83589) --- homeassistant/components/intellifire/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/intellifire/manifest.json b/homeassistant/components/intellifire/manifest.json index 67dc5a96ad7..d83e5f76397 100644 --- a/homeassistant/components/intellifire/manifest.json +++ b/homeassistant/components/intellifire/manifest.json @@ -3,7 +3,7 @@ "name": "IntelliFire", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/intellifire", - "requirements": ["intellifire4py==2.2.1"], + "requirements": ["intellifire4py==2.2.2"], "codeowners": ["@jeeftor"], "iot_class": "local_polling", "loggers": ["intellifire4py"], diff --git a/requirements_all.txt b/requirements_all.txt index 2e72a7f34a3..e3b2341a0d0 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -956,7 +956,7 @@ inkbird-ble==0.5.5 insteon-frontend-home-assistant==0.2.0 # homeassistant.components.intellifire -intellifire4py==2.2.1 +intellifire4py==2.2.2 # homeassistant.components.iotawatt iotawattpy==0.1.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index c529492eb9d..9a44a2cc0a2 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -712,7 +712,7 @@ inkbird-ble==0.5.5 insteon-frontend-home-assistant==0.2.0 # homeassistant.components.intellifire -intellifire4py==2.2.1 +intellifire4py==2.2.2 # homeassistant.components.iotawatt iotawattpy==0.1.0 From 19ddf478e2470514b674e7bfd4ca7e68ab9bb5d5 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 8 Dec 2022 15:29:14 -1000 Subject: [PATCH 13/15] Bump bluetooth-auto-recovery to 0.5.5 (#83597) changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/compare/v0.5.4...v0.5.5 fixes #78036 --- homeassistant/components/bluetooth/manifest.json | 2 +- homeassistant/package_constraints.txt | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json index a8e1c02c8b0..3c926db79d4 100644 --- a/homeassistant/components/bluetooth/manifest.json +++ b/homeassistant/components/bluetooth/manifest.json @@ -9,7 +9,7 @@ "bleak==0.19.2", "bleak-retry-connector==2.10.1", "bluetooth-adapters==0.12.0", - "bluetooth-auto-recovery==0.5.4", + "bluetooth-auto-recovery==0.5.5", "bluetooth-data-tools==0.3.0", "dbus-fast==1.75.0" ], diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 04412d26580..f0f3db19ca7 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -13,7 +13,7 @@ bcrypt==3.1.7 bleak-retry-connector==2.10.1 bleak==0.19.2 bluetooth-adapters==0.12.0 -bluetooth-auto-recovery==0.5.4 +bluetooth-auto-recovery==0.5.5 bluetooth-data-tools==0.3.0 certifi>=2021.5.30 ciso8601==2.2.0 diff --git a/requirements_all.txt b/requirements_all.txt index e3b2341a0d0..9c5329d5072 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -450,7 +450,7 @@ bluemaestro-ble==0.2.0 bluetooth-adapters==0.12.0 # homeassistant.components.bluetooth -bluetooth-auto-recovery==0.5.4 +bluetooth-auto-recovery==0.5.5 # homeassistant.components.bluetooth # homeassistant.components.led_ble diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 9a44a2cc0a2..97451c725df 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -364,7 +364,7 @@ bluemaestro-ble==0.2.0 bluetooth-adapters==0.12.0 # homeassistant.components.bluetooth -bluetooth-auto-recovery==0.5.4 +bluetooth-auto-recovery==0.5.5 # homeassistant.components.bluetooth # homeassistant.components.led_ble From 9c7b80090a1d4537282400b8f533c5d48a144948 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 8 Dec 2022 22:43:52 -0500 Subject: [PATCH 14/15] Disable multi-pan (#83603) * Disable multi-pan * One more test skip --- .../silabs_multiprotocol_addon.py | 11 ++++++++++- .../components/homeassistant_hardware/strings.json | 3 ++- .../homeassistant_hardware/translations/en.json | 1 + .../components/homeassistant_sky_connect/strings.json | 3 ++- .../homeassistant_sky_connect/translations/en.json | 1 + .../components/homeassistant_yellow/strings.json | 3 ++- .../homeassistant_yellow/translations/en.json | 1 + .../test_silabs_multiprotocol_addon.py | 3 +++ .../homeassistant_sky_connect/test_config_flow.py | 4 ++++ .../homeassistant_yellow/test_config_flow.py | 4 ++++ 10 files changed, 30 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py index 500555cc6ae..38c20a8e3cc 100644 --- a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py +++ b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py @@ -236,7 +236,16 @@ class OptionsFlowHandler(BaseMultiPanFlow, config_entries.OptionsFlow): if not is_hassio(self.hass): return self.async_abort(reason="not_hassio") - return await self.async_step_on_supervisor() + return self.async_abort( + reason="disabled_due_to_bug", + description_placeholders={ + "url": "https://developers.home-assistant.io/blog/2022/12/08/multi-pan-rollback" + }, + ) + + # pylint: disable=unreachable + + return await self.async_step_on_supervisor() # type: ignore[unreachable] async def async_step_on_supervisor( self, user_input: dict[str, Any] | None = None diff --git a/homeassistant/components/homeassistant_hardware/strings.json b/homeassistant/components/homeassistant_hardware/strings.json index 47549794fc8..819ec38925f 100644 --- a/homeassistant/components/homeassistant_hardware/strings.json +++ b/homeassistant/components/homeassistant_hardware/strings.json @@ -32,7 +32,8 @@ "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", "not_hassio": "The hardware options can only be configured on HassOS installations.", - "zha_migration_failed": "The ZHA migration did not succeed." + "zha_migration_failed": "The ZHA migration did not succeed.", + "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})" }, "progress": { "install_addon": "Please wait while the Silicon Labs Multiprotocol add-on installation finishes. This can take several minutes.", diff --git a/homeassistant/components/homeassistant_hardware/translations/en.json b/homeassistant/components/homeassistant_hardware/translations/en.json index ec75e234c4d..2d2e59c30fa 100644 --- a/homeassistant/components/homeassistant_hardware/translations/en.json +++ b/homeassistant/components/homeassistant_hardware/translations/en.json @@ -6,6 +6,7 @@ "addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.", "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", + "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})", "not_hassio": "The hardware options can only be configured on HassOS installations.", "zha_migration_failed": "The ZHA migration did not succeed." }, diff --git a/homeassistant/components/homeassistant_sky_connect/strings.json b/homeassistant/components/homeassistant_sky_connect/strings.json index 970f9d97a4c..d18d2620318 100644 --- a/homeassistant/components/homeassistant_sky_connect/strings.json +++ b/homeassistant/components/homeassistant_sky_connect/strings.json @@ -31,7 +31,8 @@ "addon_set_config_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_set_config_failed%]", "addon_start_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_start_failed%]", "not_hassio": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::not_hassio%]", - "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]" + "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]", + "disabled_due_to_bug": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::disabled_due_to_bug%]" }, "progress": { "install_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::progress::install_addon%]", diff --git a/homeassistant/components/homeassistant_sky_connect/translations/en.json b/homeassistant/components/homeassistant_sky_connect/translations/en.json index 8e12173f86a..0631d74db75 100644 --- a/homeassistant/components/homeassistant_sky_connect/translations/en.json +++ b/homeassistant/components/homeassistant_sky_connect/translations/en.json @@ -5,6 +5,7 @@ "addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.", "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", + "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})", "not_hassio": "The hardware options can only be configured on HassOS installations.", "zha_migration_failed": "The ZHA migration did not succeed." }, diff --git a/homeassistant/components/homeassistant_yellow/strings.json b/homeassistant/components/homeassistant_yellow/strings.json index 970f9d97a4c..d18d2620318 100644 --- a/homeassistant/components/homeassistant_yellow/strings.json +++ b/homeassistant/components/homeassistant_yellow/strings.json @@ -31,7 +31,8 @@ "addon_set_config_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_set_config_failed%]", "addon_start_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_start_failed%]", "not_hassio": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::not_hassio%]", - "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]" + "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]", + "disabled_due_to_bug": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::disabled_due_to_bug%]" }, "progress": { "install_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::progress::install_addon%]", diff --git a/homeassistant/components/homeassistant_yellow/translations/en.json b/homeassistant/components/homeassistant_yellow/translations/en.json index 8e12173f86a..0631d74db75 100644 --- a/homeassistant/components/homeassistant_yellow/translations/en.json +++ b/homeassistant/components/homeassistant_yellow/translations/en.json @@ -5,6 +5,7 @@ "addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.", "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", + "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})", "not_hassio": "The hardware options can only be configured on HassOS installations.", "zha_migration_failed": "The ZHA migration did not succeed." }, diff --git a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py index 577ac25eb82..fbf6cdda4c7 100644 --- a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py +++ b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py @@ -20,6 +20,9 @@ from tests.common import MockConfigEntry, MockModule, mock_integration, mock_pla TEST_DOMAIN = "test" +pytest.skip(reason="Temporarily disabled", allow_module_level=True) + + class TestConfigFlow(ConfigFlow, domain=TEST_DOMAIN): """Handle a config flow for the silabs multiprotocol add-on.""" diff --git a/tests/components/homeassistant_sky_connect/test_config_flow.py b/tests/components/homeassistant_sky_connect/test_config_flow.py index c38edf00fa7..931abc69c4a 100644 --- a/tests/components/homeassistant_sky_connect/test_config_flow.py +++ b/tests/components/homeassistant_sky_connect/test_config_flow.py @@ -2,6 +2,8 @@ import copy from unittest.mock import Mock, patch +import pytest + from homeassistant.components import homeassistant_sky_connect, usb from homeassistant.components.homeassistant_sky_connect.const import DOMAIN from homeassistant.components.zha.core.const import ( @@ -150,6 +152,7 @@ async def test_config_flow_update_device(hass: HomeAssistant) -> None: assert len(mock_unload_entry.mock_calls) == 1 +@pytest.mark.skip(reason="Temporarily disabled") async def test_option_flow_install_multi_pan_addon( hass: HomeAssistant, addon_store_info, @@ -240,6 +243,7 @@ def mock_detect_radio_type(radio_type=RadioType.ezsp, ret=True): return detect +@pytest.mark.skip(reason="Temporarily disabled") @patch( "homeassistant.components.zha.radio_manager.ZhaRadioManager.detect_radio_type", mock_detect_radio_type(), diff --git a/tests/components/homeassistant_yellow/test_config_flow.py b/tests/components/homeassistant_yellow/test_config_flow.py index 53d1c5e974d..3d846501524 100644 --- a/tests/components/homeassistant_yellow/test_config_flow.py +++ b/tests/components/homeassistant_yellow/test_config_flow.py @@ -1,6 +1,8 @@ """Test the Home Assistant Yellow config flow.""" from unittest.mock import Mock, patch +import pytest + from homeassistant.components.homeassistant_yellow.const import DOMAIN from homeassistant.components.zha.core.const import DOMAIN as ZHA_DOMAIN from homeassistant.core import HomeAssistant @@ -59,6 +61,7 @@ async def test_config_flow_single_entry(hass: HomeAssistant) -> None: mock_setup_entry.assert_not_called() +@pytest.mark.skip(reason="Temporarily disabled") async def test_option_flow_install_multi_pan_addon( hass: HomeAssistant, addon_store_info, @@ -127,6 +130,7 @@ async def test_option_flow_install_multi_pan_addon( assert result["type"] == FlowResultType.CREATE_ENTRY +@pytest.mark.skip(reason="Temporarily disabled") async def test_option_flow_install_multi_pan_addon_zha( hass: HomeAssistant, addon_store_info, From e9796547c6360a37ccba2b5f84ea835d396871e7 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 8 Dec 2022 23:21:45 -0500 Subject: [PATCH 15/15] Make mypy happy (#83605) --- .../homeassistant_hardware/silabs_multiprotocol_addon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py index 38c20a8e3cc..41dbcabae43 100644 --- a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py +++ b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py @@ -245,7 +245,7 @@ class OptionsFlowHandler(BaseMultiPanFlow, config_entries.OptionsFlow): # pylint: disable=unreachable - return await self.async_step_on_supervisor() # type: ignore[unreachable] + return await self.async_step_on_supervisor() async def async_step_on_supervisor( self, user_input: dict[str, Any] | None = None