From 244bfb2096d085714f1ae1b521a8e99d5e70d7c4 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Mon, 9 Nov 2020 22:47:38 -0700 Subject: [PATCH] Deprecate YAML config for Notion (0.119 removal) (#43026) --- homeassistant/components/notion/__init__.py | 32 ++----------------- .../components/notion/config_flow.py | 4 --- tests/components/notion/test_config_flow.py | 17 ---------- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/homeassistant/components/notion/__init__.py b/homeassistant/components/notion/__init__.py index 1e7d12df38c..ebc3010308e 100644 --- a/homeassistant/components/notion/__init__.py +++ b/homeassistant/components/notion/__init__.py @@ -5,9 +5,8 @@ import logging from aionotion import async_get_client from aionotion.errors import InvalidCredentialsError, NotionError -import voluptuous as vol -from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry +from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_ATTRIBUTION, CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryNotReady @@ -34,39 +33,12 @@ ATTR_SYSTEM_NAME = "system_name" DEFAULT_ATTRIBUTION = "Data provided by Notion" DEFAULT_SCAN_INTERVAL = timedelta(minutes=1) -CONFIG_SCHEMA = vol.Schema( - { - DOMAIN: vol.Schema( - { - vol.Required(CONF_USERNAME): cv.string, - vol.Required(CONF_PASSWORD): cv.string, - } - ) - }, - extra=vol.ALLOW_EXTRA, -) +CONFIG_SCHEMA = cv.deprecated(DOMAIN, invalidation_version="0.119") async def async_setup(hass: HomeAssistant, config: dict) -> bool: """Set up the Notion component.""" hass.data[DOMAIN] = {DATA_COORDINATOR: {}} - - if DOMAIN not in config: - return True - - conf = config[DOMAIN] - - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, - context={"source": SOURCE_IMPORT}, - data={ - CONF_USERNAME: conf[CONF_USERNAME], - CONF_PASSWORD: conf[CONF_PASSWORD], - }, - ) - ) - return True diff --git a/homeassistant/components/notion/config_flow.py b/homeassistant/components/notion/config_flow.py index bcbd22bccc6..86c51e3c13c 100644 --- a/homeassistant/components/notion/config_flow.py +++ b/homeassistant/components/notion/config_flow.py @@ -28,10 +28,6 @@ class NotionFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): step_id="user", data_schema=self.data_schema, errors=errors or {} ) - async def async_step_import(self, import_config): - """Import a config entry from configuration.yaml.""" - return await self.async_step_user(import_config) - async def async_step_user(self, user_input=None): """Handle the start of the config flow.""" if not user_input: diff --git a/tests/components/notion/test_config_flow.py b/tests/components/notion/test_config_flow.py index 7a887ac3468..728a8d40a52 100644 --- a/tests/components/notion/test_config_flow.py +++ b/tests/components/notion/test_config_flow.py @@ -68,23 +68,6 @@ async def test_show_form(hass): assert result["step_id"] == "user" -async def test_step_import(hass, mock_aionotion): - """Test that the import step works.""" - conf = {CONF_USERNAME: "user@host.com", CONF_PASSWORD: "password123"} - - flow = config_flow.NotionFlowHandler() - flow.hass = hass - flow.context = {"source": SOURCE_USER} - - result = await flow.async_step_import(import_config=conf) - assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY - assert result["title"] == "user@host.com" - assert result["data"] == { - CONF_USERNAME: "user@host.com", - CONF_PASSWORD: "password123", - } - - async def test_step_user(hass, mock_aionotion): """Test that the user step works.""" conf = {CONF_USERNAME: "user@host.com", CONF_PASSWORD: "password123"}