From e62148b8ff62e4d7d8c7b1ee2f3c57f9fba586f2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 21 Dec 2021 12:53:19 +0100 Subject: [PATCH] Remove deprecated YAML configuration from Stookalert (#61007) --- .../components/stookalert/binary_sensor.py | 44 ++----------------- .../components/stookalert/config_flow.py | 4 -- .../components/stookalert/test_config_flow.py | 15 +------ 3 files changed, 4 insertions(+), 59 deletions(-) diff --git a/homeassistant/components/stookalert/binary_sensor.py b/homeassistant/components/stookalert/binary_sensor.py index b606e3f3d3b..974635e2efd 100644 --- a/homeassistant/components/stookalert/binary_sensor.py +++ b/homeassistant/components/stookalert/binary_sensor.py @@ -4,59 +4,21 @@ from __future__ import annotations from datetime import timedelta import stookalert -import voluptuous as vol from homeassistant.components.binary_sensor import ( - PLATFORM_SCHEMA, BinarySensorDeviceClass, BinarySensorEntity, ) -from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry -from homeassistant.const import CONF_NAME +from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant -from homeassistant.helpers import config_validation as cv from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback -from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType -from .const import CONF_PROVINCE, DOMAIN, LOGGER, PROVINCES +from .const import CONF_PROVINCE, DOMAIN -DEFAULT_NAME = "Stookalert" -ATTRIBUTION = "Data provided by rivm.nl" SCAN_INTERVAL = timedelta(minutes=60) -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( - { - vol.Required(CONF_PROVINCE): vol.In(PROVINCES), - vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, - } -) - - -async def async_setup_platform( - hass: HomeAssistant, - config: ConfigType, - async_add_entities: AddEntitiesCallback, - discovery_info: DiscoveryInfoType | None = None, -) -> None: - """Import the Stookalert platform into a config entry.""" - LOGGER.warning( - "Configuration of the Stookalert platform in YAML is deprecated and will be " - "removed in Home Assistant 2022.1; Your existing configuration " - "has been imported into the UI automatically and can be safely removed " - "from your configuration.yaml file" - ) - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, - context={"source": SOURCE_IMPORT}, - data={ - CONF_PROVINCE: config[CONF_PROVINCE], - }, - ) - ) - async def async_setup_entry( hass: HomeAssistant, @@ -71,7 +33,7 @@ async def async_setup_entry( class StookalertBinarySensor(BinarySensorEntity): """Defines a Stookalert binary sensor.""" - _attr_attribution = ATTRIBUTION + _attr_attribution = "Data provided by rivm.nl" _attr_device_class = BinarySensorDeviceClass.SAFETY def __init__(self, client: stookalert.stookalert, entry: ConfigEntry) -> None: diff --git a/homeassistant/components/stookalert/config_flow.py b/homeassistant/components/stookalert/config_flow.py index 4f625ec2d1a..02189bc161f 100644 --- a/homeassistant/components/stookalert/config_flow.py +++ b/homeassistant/components/stookalert/config_flow.py @@ -31,7 +31,3 @@ class StookalertFlowHandler(ConfigFlow, domain=DOMAIN): step_id="user", data_schema=vol.Schema({vol.Required(CONF_PROVINCE): vol.In(PROVINCES)}), ) - - async def async_step_import(self, config: dict[str, Any]) -> FlowResult: - """Handle a flow initialized by importing a config.""" - return await self.async_step_user(config) diff --git a/tests/components/stookalert/test_config_flow.py b/tests/components/stookalert/test_config_flow.py index ceee26fa8e2..6b5dd6fd4ce 100644 --- a/tests/components/stookalert/test_config_flow.py +++ b/tests/components/stookalert/test_config_flow.py @@ -2,7 +2,7 @@ from unittest.mock import patch from homeassistant.components.stookalert.const import CONF_PROVINCE, DOMAIN -from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER +from homeassistant.config_entries import SOURCE_USER from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import ( RESULT_TYPE_ABORT, @@ -63,16 +63,3 @@ async def test_already_configured(hass: HomeAssistant) -> None: assert result2.get("type") == RESULT_TYPE_ABORT assert result2.get("reason") == "already_configured" - - -async def test_import_flow(hass: HomeAssistant) -> None: - """Test the import configuration flow.""" - result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_IMPORT}, data={"province": "Overijssel"} - ) - - assert result.get("type") == RESULT_TYPE_CREATE_ENTRY - assert result.get("title") == "Overijssel" - assert result.get("data") == { - CONF_PROVINCE: "Overijssel", - }