From c7d2499a52c92809ee652bfd5c1b8a7a772d6ede Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk <11290930+bouwew@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:47:12 +0200 Subject: [PATCH] Bump plugwise to v0.33.1 (#102052) --- homeassistant/components/plugwise/climate.py | 10 ---------- homeassistant/components/plugwise/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- .../plugwise/fixtures/adam_jip/all_data.json | 4 ---- .../plugwise/fixtures/m_adam_cooling/all_data.json | 5 +---- .../plugwise/fixtures/m_adam_heating/all_data.json | 3 --- tests/components/plugwise/test_climate.py | 2 +- 8 files changed, 5 insertions(+), 25 deletions(-) diff --git a/homeassistant/components/plugwise/climate.py b/homeassistant/components/plugwise/climate.py index 610ffa34d7c..32146c2753f 100644 --- a/homeassistant/components/plugwise/climate.py +++ b/homeassistant/components/plugwise/climate.py @@ -120,16 +120,6 @@ class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity): @property def hvac_action(self) -> HVACAction | None: """Return the current running hvac operation if supported.""" - # When control_state is present, prefer this data - if (control_state := self.device.get("control_state")) == "cooling": - return HVACAction.COOLING - # Support preheating state as heating, - # until preheating is added as a separate state - if control_state in ["heating", "preheating"]: - return HVACAction.HEATING - if control_state == "off": - return HVACAction.IDLE - heater: str | None = self.coordinator.data.gateway["heater_id"] if heater: heater_data = self.coordinator.data.devices[heater] diff --git a/homeassistant/components/plugwise/manifest.json b/homeassistant/components/plugwise/manifest.json index c8c678d6aae..b4cc418cc7e 100644 --- a/homeassistant/components/plugwise/manifest.json +++ b/homeassistant/components/plugwise/manifest.json @@ -7,6 +7,6 @@ "integration_type": "hub", "iot_class": "local_polling", "loggers": ["crcmod", "plugwise"], - "requirements": ["plugwise==0.33.0"], + "requirements": ["plugwise==0.33.1"], "zeroconf": ["_plugwise._tcp.local."] } diff --git a/requirements_all.txt b/requirements_all.txt index 91e506a487f..c886ab7e2b3 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1455,7 +1455,7 @@ plexauth==0.0.6 plexwebsocket==0.0.14 # homeassistant.components.plugwise -plugwise==0.33.0 +plugwise==0.33.1 # homeassistant.components.plum_lightpad plumlightpad==0.0.11 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 06f4e7260fe..e5a5492059d 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1115,7 +1115,7 @@ plexauth==0.0.6 plexwebsocket==0.0.14 # homeassistant.components.plugwise -plugwise==0.33.0 +plugwise==0.33.1 # homeassistant.components.plum_lightpad plumlightpad==0.0.11 diff --git a/tests/components/plugwise/fixtures/adam_jip/all_data.json b/tests/components/plugwise/fixtures/adam_jip/all_data.json index 4dda9af3b54..ba00e3928d7 100644 --- a/tests/components/plugwise/fixtures/adam_jip/all_data.json +++ b/tests/components/plugwise/fixtures/adam_jip/all_data.json @@ -4,7 +4,6 @@ "active_preset": "no_frost", "available": true, "available_schedules": ["None"], - "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", "hardware": "255", @@ -101,7 +100,6 @@ "active_preset": "home", "available": true, "available_schedules": ["None"], - "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", "hardware": "255", @@ -159,7 +157,6 @@ "active_preset": "home", "available": true, "available_schedules": ["None"], - "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", "hardware": "255", @@ -271,7 +268,6 @@ "active_preset": "home", "available": true, "available_schedules": ["None"], - "control_state": "off", "dev_class": "zone_thermometer", "firmware": "2020-09-01T02:00:00+02:00", "hardware": "1", diff --git a/tests/components/plugwise/fixtures/m_adam_cooling/all_data.json b/tests/components/plugwise/fixtures/m_adam_cooling/all_data.json index ac7e602821e..af8c012cae3 100644 --- a/tests/components/plugwise/fixtures/m_adam_cooling/all_data.json +++ b/tests/components/plugwise/fixtures/m_adam_cooling/all_data.json @@ -53,7 +53,6 @@ "active_preset": "asleep", "available": true, "available_schedules": ["Weekschema", "Badkamer", "Test"], - "control_state": "cooling", "dev_class": "thermostat", "last_used": "Weekschema", "location": "f2bf9048bef64cc5b6d5110154e33c81", @@ -88,7 +87,6 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "cooling", "regulation_modes": [ "heating", "off", @@ -96,7 +94,7 @@ "bleeding_hot", "cooling" ], - "select_regulation_mode": "heating", + "select_regulation_mode": "cooling", "sensors": { "outdoor_temperature": 29.65 }, @@ -107,7 +105,6 @@ "active_preset": "home", "available": true, "available_schedules": ["Weekschema", "Badkamer", "Test"], - "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-10T02:00:00+02:00", "hardware": "255", diff --git a/tests/components/plugwise/fixtures/m_adam_heating/all_data.json b/tests/components/plugwise/fixtures/m_adam_heating/all_data.json index a4923b1c549..efefa95d45c 100644 --- a/tests/components/plugwise/fixtures/m_adam_heating/all_data.json +++ b/tests/components/plugwise/fixtures/m_adam_heating/all_data.json @@ -58,7 +58,6 @@ "active_preset": "asleep", "available": true, "available_schedules": ["Weekschema", "Badkamer", "Test"], - "control_state": "heating", "dev_class": "thermostat", "last_used": "Weekschema", "location": "f2bf9048bef64cc5b6d5110154e33c81", @@ -91,7 +90,6 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "heating", "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], "select_regulation_mode": "heating", "sensors": { @@ -104,7 +102,6 @@ "active_preset": "home", "available": true, "available_schedules": ["Weekschema", "Badkamer", "Test"], - "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-10T02:00:00+02:00", "hardware": "255", diff --git a/tests/components/plugwise/test_climate.py b/tests/components/plugwise/test_climate.py index c73bd5b6190..496eeaae084 100644 --- a/tests/components/plugwise/test_climate.py +++ b/tests/components/plugwise/test_climate.py @@ -64,7 +64,7 @@ async def test_adam_2_climate_entity_attributes( state = hass.states.get("climate.lisa_badkamer") assert state assert state.state == HVACMode.AUTO - assert state.attributes["hvac_action"] == "idle" + assert state.attributes["hvac_action"] == "heating" assert state.attributes["hvac_modes"] == [HVACMode.HEAT, HVACMode.AUTO]