Merge pull request #865 from plugwise/pw_config_entry

Remove double use of entry, bump plugwise to v.1.7.4

Author: bouwew

custom_components/plugwise/coordinator.py

@@ -126,24 +126,20 @@ async def _async_update_data(self) -> dict[str, GwEntityData]:
             ) from err
 
         LOGGER.debug(f"{self.api.smile_name} data: %s", data)
-        await self._async_add_remove_devices(data, self.config_entry)
+        await self._async_add_remove_devices(data)
         return data
 
-    async def _async_add_remove_devices(
-        self, data: dict[str, GwEntityData], entry: ConfigEntry
-    ) -> None:
+    async def _async_add_remove_devices(self, data: dict[str, GwEntityData]) -> None:
         """Add new Plugwise devices, remove non-existing devices."""
         # Check for new or removed devices
         self.new_devices = set(data) - self._current_devices
         removed_devices = self._current_devices - set(data)
         self._current_devices = set(data)
 
         if removed_devices:
-            await self._async_remove_devices(data, entry)
+            await self._async_remove_devices(data)
 
-    async def _async_remove_devices(
-        self, data: dict[str, GwEntityData], entry: ConfigEntry
-    ) -> None:
+    async def _async_remove_devices(self, data: dict[str, GwEntityData]) -> None:
         """Clean registries when removed devices found."""
         device_reg = dr.async_get(self.hass)
         device_list = dr.async_entries_for_config_entry(
@@ -164,7 +160,7 @@ async def _async_remove_devices(
                         and identifier[1] not in data
                     ):
                         device_reg.async_update_device(
-                            device_entry.id, remove_config_entry_id=entry.entry_id
+                            device_entry.id, remove_config_entry_id=self.config_entry.entry_id
                         )
                         LOGGER.debug(
                             "Removed %s device/zone %s %s from device_registry",

custom_components/plugwise/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==1.7.3"],
-  "version": "0.57.2",
+  "requirements": ["plugwise==1.7.4"],
+  "version": "0.57.3",
   "zeroconf": ["_plugwise._tcp.local."]
 }

pyproject.toml

@@ -4,7 +4,7 @@ version = "0.57.1"
 description = "Plugwise beta custom-component"
 readme = "README.md"
 requires-python = ">=3.12"
-license = {file = "LICENSE"}
+license = "MIT"
 keywords = ["Plugwise", "Adam", "Anna", "P1", "Stretch", "Smile"]
 authors = [
     {name = "@bouwew"},
@@ -22,7 +22,6 @@ classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python",
   "Intended Audience :: Testers",
-  "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3.13",
   "Topic :: Home Automation",]