Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump plugwise to v0.33.2 #102671

Merged
merged 3 commits into from
Oct 24, 2023
Merged

Bump plugwise to v0.33.2 #102671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f033c2
Bump plugwise to v0.33.2
bouwew Oct 24, 2023
e099d7d
Adapt to change in backend, test-fixtures and tests
bouwew Oct 24, 2023
3c02c01
Update snapshot-file
bouwew Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions homeassistant/components/plugwise/climate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
raise HomeAssistantError("Unsupported hvac_mode")

await self.coordinator.api.set_schedule_state(
self.device["location"],
self.device["last_used"],
"on" if hvac_mode == HVACMode.AUTO else "off",
self.device["location"], "on" if hvac_mode == HVACMode.AUTO else "off"
)

@plugwise_command
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/plugwise/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["crcmod", "plugwise"],
"requirements": ["plugwise==0.33.1"],
"requirements": ["plugwise==0.33.2"],
"zeroconf": ["_plugwise._tcp.local."]
}
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ plexauth==0.0.6
plexwebsocket==0.0.14

# homeassistant.components.plugwise
plugwise==0.33.1
plugwise==0.33.2

# homeassistant.components.plum_lightpad
plumlightpad==0.0.11
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ plexauth==0.0.6
plexwebsocket==0.0.14

# homeassistant.components.plugwise
plugwise==0.33.1
plugwise==0.33.2

# homeassistant.components.plum_lightpad
plumlightpad==0.0.11
Expand Down
4 changes: 0 additions & 4 deletions tests/components/plugwise/fixtures/adam_jip/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-27T02:00:00+02:00",
"hardware": "255",
"last_used": null,
"location": "06aecb3d00354375924f50c47af36bd2",
"mode": "heat",
"model": "Lisa",
Expand Down Expand Up @@ -103,7 +102,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-27T02:00:00+02:00",
"hardware": "255",
"last_used": null,
"location": "d27aede973b54be484f6842d1b2802ad",
"mode": "heat",
"model": "Lisa",
Expand Down Expand Up @@ -160,7 +158,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-27T02:00:00+02:00",
"hardware": "255",
"last_used": null,
"location": "d58fec52899f4f1c92e4f8fad6d8c48c",
"mode": "heat",
"model": "Lisa",
Expand Down Expand Up @@ -271,7 +268,6 @@
"dev_class": "zone_thermometer",
"firmware": "2020-09-01T02:00:00+02:00",
"hardware": "1",
"last_used": null,
"location": "13228dab8ce04617af318a2888b3c548",
"mode": "heat",
"model": "Jip",
Expand Down
5 changes: 0 additions & 5 deletions tests/components/plugwise/fixtures/adam_multiple_devices_per_zone/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-27T02:00:00+02:00",
"hardware": "255",
"last_used": "CV Jessie",
"location": "82fa13f017d240daa0d0ea1775420f24",
"mode": "auto",
"model": "Lisa",
Expand Down Expand Up @@ -257,7 +256,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-08-02T02:00:00+02:00",
"hardware": "255",
"last_used": "GF7 Woonkamer",
"location": "c50f167537524366a5af7aa3942feb1e",
"mode": "auto",
"model": "Lisa",
Expand Down Expand Up @@ -341,7 +339,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-27T02:00:00+02:00",
"hardware": "255",
"last_used": "Badkamer Schema",
"location": "12493538af164a409c6a1c79e38afe1c",
"mode": "heat",
"model": "Lisa",
Expand Down Expand Up @@ -381,7 +378,6 @@
"dev_class": "thermostatic_radiator_valve",
"firmware": "2019-03-27T01:00:00+01:00",
"hardware": "1",
"last_used": "Badkamer Schema",
"location": "446ac08dd04d4eff8ac57489757b7314",
"mode": "heat",
"model": "Tom/Floor",
Expand Down Expand Up @@ -423,7 +419,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-27T02:00:00+02:00",
"hardware": "255",
"last_used": "Badkamer Schema",
"location": "08963fec7c53423ca5680aa4cb502c63",
"mode": "auto",
"model": "Lisa",
Expand Down
1 change: 0 additions & 1 deletion tests/components/plugwise/fixtures/anna_heatpump_heating/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"dev_class": "thermostat",
"firmware": "2018-02-08T11:15:53+01:00",
"hardware": "6539-1301-5002",
"last_used": "standaard",
"location": "c784ee9fdab44e1395b8dee7d7a497d5",
"mode": "auto",
"model": "ThermoTouch",
Expand Down
2 changes: 0 additions & 2 deletions tests/components/plugwise/fixtures/m_adam_cooling/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"available": true,
"available_schedules": ["Weekschema", "Badkamer", "Test"],
"dev_class": "thermostat",
"last_used": "Weekschema",
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"mode": "heat_cool",
"model": "ThermoTouch",
Expand Down Expand Up @@ -108,7 +107,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-10T02:00:00+02:00",
"hardware": "255",
"last_used": "Badkamer",
"location": "f871b8c4d63549319221e294e4f88074",
"mode": "auto",
"model": "Lisa",
Expand Down
2 changes: 0 additions & 2 deletions tests/components/plugwise/fixtures/m_adam_heating/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"available": true,
"available_schedules": ["Weekschema", "Badkamer", "Test"],
"dev_class": "thermostat",
"last_used": "Weekschema",
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"mode": "heat",
"model": "ThermoTouch",
Expand Down Expand Up @@ -105,7 +104,6 @@
"dev_class": "zone_thermostat",
"firmware": "2016-10-10T02:00:00+02:00",
"hardware": "255",
"last_used": "Badkamer",
"location": "f871b8c4d63549319221e294e4f88074",
"mode": "auto",
"model": "Lisa",
Expand Down
1 change: 0 additions & 1 deletion tests/components/plugwise/fixtures/m_anna_heatpump_cooling/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"dev_class": "thermostat",
"firmware": "2018-02-08T11:15:53+01:00",
"hardware": "6539-1301-5002",
"last_used": "standaard",
"location": "c784ee9fdab44e1395b8dee7d7a497d5",
"mode": "auto",
"model": "ThermoTouch",
Expand Down
1 change: 0 additions & 1 deletion tests/components/plugwise/fixtures/m_anna_heatpump_idle/all_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"dev_class": "thermostat",
"firmware": "2018-02-08T11:15:53+01:00",
"hardware": "6539-1301-5002",
"last_used": "standaard",
"location": "c784ee9fdab44e1395b8dee7d7a497d5",
"mode": "auto",
"model": "ThermoTouch",
Expand Down
5 changes: 0 additions & 5 deletions tests/components/plugwise/snapshots/test_diagnostics.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
'dev_class': 'zone_thermostat',
'firmware': '2016-10-27T02:00:00+02:00',
'hardware': '255',
'last_used': 'CV Jessie',
'location': '82fa13f017d240daa0d0ea1775420f24',
'mode': 'auto',
'model': 'Lisa',
Expand Down Expand Up @@ -265,7 +264,6 @@
'dev_class': 'zone_thermostat',
'firmware': '2016-08-02T02:00:00+02:00',
'hardware': '255',
'last_used': 'GF7 Woonkamer',
'location': 'c50f167537524366a5af7aa3942feb1e',
'mode': 'auto',
'model': 'Lisa',
Expand Down Expand Up @@ -355,7 +353,6 @@
'dev_class': 'zone_thermostat',
'firmware': '2016-10-27T02:00:00+02:00',
'hardware': '255',
'last_used': 'Badkamer Schema',
'location': '12493538af164a409c6a1c79e38afe1c',
'mode': 'heat',
'model': 'Lisa',
Expand Down Expand Up @@ -401,7 +398,6 @@
'dev_class': 'thermostatic_radiator_valve',
'firmware': '2019-03-27T01:00:00+01:00',
'hardware': '1',
'last_used': 'Badkamer Schema',
'location': '446ac08dd04d4eff8ac57489757b7314',
'mode': 'heat',
'model': 'Tom/Floor',
Expand Down Expand Up @@ -449,7 +445,6 @@
'dev_class': 'zone_thermostat',
'firmware': '2016-10-27T02:00:00+02:00',
'hardware': '255',
'last_used': 'Badkamer Schema',
'location': '08963fec7c53423ca5680aa4cb502c63',
'mode': 'auto',
'model': 'Lisa',
Expand Down
6 changes: 3 additions & 3 deletions tests/components/plugwise/test_climate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ async def test_adam_climate_entity_climate_changes(
)
assert mock_smile_adam.set_schedule_state.call_count == 2
mock_smile_adam.set_schedule_state.assert_called_with(
"c50f167537524366a5af7aa3942feb1e", "GF7 Woonkamer", "off"
"c50f167537524366a5af7aa3942feb1e", "off"
)

with pytest.raises(HomeAssistantError):
Expand Down Expand Up @@ -272,7 +272,7 @@ async def test_anna_climate_entity_climate_changes(
)
assert mock_smile_anna.set_schedule_state.call_count == 1
mock_smile_anna.set_schedule_state.assert_called_with(
"c784ee9fdab44e1395b8dee7d7a497d5", "standaard", "on"
"c784ee9fdab44e1395b8dee7d7a497d5", "on"
)

await hass.services.async_call(
Expand All @@ -283,7 +283,7 @@ async def test_anna_climate_entity_climate_changes(
)
assert mock_smile_anna.set_schedule_state.call_count == 2
mock_smile_anna.set_schedule_state.assert_called_with(
"c784ee9fdab44e1395b8dee7d7a497d5", "standaard", "off"
"c784ee9fdab44e1395b8dee7d7a497d5", "off"
)
data = mock_smile_anna.async_update.return_value
data.devices["3cb70739631c4d17a86b8b12e8a5161b"]["available_schedules"] = ["None"]
Expand Down