From 7c8f4a4262fbeca675ef8bdff066f8904dcedf35 Mon Sep 17 00:00:00 2001 From: Klaas Schoute Date: Sun, 20 Feb 2022 16:58:21 +0100 Subject: [PATCH] Update Pure Energie integration (#66946) * Remove service entry_type * Set raise on progress --- homeassistant/components/pure_energie/config_flow.py | 2 +- homeassistant/components/pure_energie/sensor.py | 2 -- tests/components/pure_energie/test_sensor.py | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/homeassistant/components/pure_energie/config_flow.py b/homeassistant/components/pure_energie/config_flow.py index 526bf004fd5..2b1e20d645e 100644 --- a/homeassistant/components/pure_energie/config_flow.py +++ b/homeassistant/components/pure_energie/config_flow.py @@ -35,7 +35,7 @@ class PureEnergieFlowHandler(ConfigFlow, domain=DOMAIN): except GridNetConnectionError: errors["base"] = "cannot_connect" else: - await self.async_set_unique_id(device.n2g_id) + await self.async_set_unique_id(device.n2g_id, raise_on_progress=False) self._abort_if_unique_id_configured( updates={CONF_HOST: user_input[CONF_HOST]} ) diff --git a/homeassistant/components/pure_energie/sensor.py b/homeassistant/components/pure_energie/sensor.py index 64ada3925f3..fffbfd7c7bb 100644 --- a/homeassistant/components/pure_energie/sensor.py +++ b/homeassistant/components/pure_energie/sensor.py @@ -14,7 +14,6 @@ from homeassistant.components.sensor import ( from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_HOST, ENERGY_KILO_WATT_HOUR, POWER_WATT from homeassistant.core import HomeAssistant -from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity @@ -98,7 +97,6 @@ class PureEnergieSensorEntity(CoordinatorEntity[PureEnergieData], SensorEntity): self.entity_description = description self._attr_unique_id = f"{coordinator.data.device.n2g_id}_{description.key}" self._attr_device_info = DeviceInfo( - entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, coordinator.data.device.n2g_id)}, configuration_url=f"http://{coordinator.config_entry.data[CONF_HOST]}", sw_version=coordinator.data.device.firmware, diff --git a/tests/components/pure_energie/test_sensor.py b/tests/components/pure_energie/test_sensor.py index dddafa3c24b..60894ac09f8 100644 --- a/tests/components/pure_energie/test_sensor.py +++ b/tests/components/pure_energie/test_sensor.py @@ -70,6 +70,5 @@ async def test_sensors( assert device_entry.identifiers == {(DOMAIN, "aabbccddeeff")} assert device_entry.name == "home" assert device_entry.manufacturer == "NET2GRID" - assert device_entry.entry_type is dr.DeviceEntryType.SERVICE assert device_entry.model == "SBWF3102" assert device_entry.sw_version == "1.6.16"