Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/litterrobot/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
"iot_class": "cloud_push",
"loggers": ["pylitterbot"],
"quality_scale": "platinum",
"requirements": ["pylitterbot==2025.5.0"]
"requirements": ["pylitterbot==2025.6.4"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/mealie/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
"ingress_url": "Ingress URLs are only used for accessing the Mealie UI. Use your Home Assistant IP address and the network port within the configuration tab of the Mealie app.",
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
"mealie_version": "Minimum required version is v1.0.0. Please upgrade Mealie and then retry.",
"mealie_version": "Minimum required version is v2.0.0. Please upgrade Mealie and then retry.",
"unknown": "[%key:common::config_flow::error::unknown%]"
},
"step": {
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/mitsubishi_comfort/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"integration_type": "hub",
"iot_class": "local_polling",
"quality_scale": "bronze",
"requirements": ["mitsubishi-comfort==0.5.1"]
"requirements": ["mitsubishi-comfort==0.5.2"]
}
4 changes: 2 additions & 2 deletions homeassistant/components/plugwise/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
}

type NumberType = Literal[
"maximum_boiler_temperature",
"max_dhw_temperature",
"boiler_temperature",
"dhw_temperature",
"temperature_offset",
]

Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/plugwise/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"iot_class": "local_polling",
"loggers": ["plugwise"],
"quality_scale": "platinum",
"requirements": ["plugwise==1.14.4"],
"requirements": ["plugwise==1.14.5"],
"zeroconf": ["_plugwise._tcp.local."]
}
6 changes: 3 additions & 3 deletions homeassistant/components/plugwise/number.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ class PlugwiseNumberEntityDescription(NumberEntityDescription):

NUMBER_TYPES = (
PlugwiseNumberEntityDescription(
key="maximum_boiler_temperature",
key="boiler_temperature",
translation_key="maximum_boiler_temperature",
device_class=NumberDeviceClass.TEMPERATURE,
entity_category=EntityCategory.CONFIG,
native_unit_of_measurement=UnitOfTemperature.CELSIUS,
),
PlugwiseNumberEntityDescription(
key="max_dhw_temperature",
key="dhw_temperature",
translation_key="max_dhw_temperature",
device_class=NumberDeviceClass.TEMPERATURE,
entity_category=EntityCategory.CONFIG,
Expand Down Expand Up @@ -94,7 +94,7 @@ def __init__(
self._attr_mode = NumberMode.BOX
self._attr_native_max_value = self.device[description.key]["upper_bound"]
self._attr_native_min_value = self.device[description.key]["lower_bound"]
self._attr_unique_id = f"{device_id}-{description.key}"
self._attr_unique_id = f"{device_id}-{description.translation_key}"
self.device_id = device_id
self.entity_description = description

Expand Down
6 changes: 3 additions & 3 deletions requirements_all.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions tests/components/mikrotik/test_select.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from syrupy.assertion import SnapshotAssertion

from homeassistant.components.mikrotik.const import INTERFACE, MIKROTIK_SERVICES, POE
from homeassistant.components.mikrotik.select import SELECTS, MikrotikSelectEntity
from homeassistant.components.select import (
ATTR_OPTION,
DOMAIN as SELECT_DOMAIN,
Expand Down Expand Up @@ -79,3 +80,22 @@ def command_side_effect(cmd: str, **params: Any) -> list[dict[str, Any]]:

assert (state := hass.states.get(entity_id))
assert state.state == "forced_on"


async def test_current_option_none_without_poe_state(hass: HomeAssistant) -> None:
"""Test current_option is None for an interface without a reported PoE state."""
with patch("homeassistant.components.mikrotik.PLATFORMS", [Platform.SELECT]):
config_entry = await setup_mikrotik_entry(
hass,
interface_data=[dict(ETHER1_INTERFACE)],
poe_data=[ETHER1_POE],
)

entity = MikrotikSelectEntity(
config_entry,
config_entry.runtime_data,
SELECTS[0],
dict(ETHER1_INTERFACE),
)

assert entity.current_option is None
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
"heating_state": true,
"secondary_boiler_state": false
},
"boiler_temperature": {
"current": 29.1,
"lower_bound": 0.0,
"resolution": 1.0,
"setpoint": 60.0,
"upper_bound": 100.0
},
"dev_class": "heater_central",
"dhw_mode": "eco",
"dhw_modes": ["comfort", "eco"],
"location": "a57efe5f145f498c9be62a9b63626fbf",
"max_dhw_temperature": {
"dhw_temperature": {
"current": 46.3,
"lower_bound": 35.0,
"resolution": 0.01,
"setpoint": 53.0,
"upper_bound": 60.0
},
"maximum_boiler_temperature": {
"current": 29.1,
"lower_bound": 0.0,
"resolution": 1.0,
"setpoint": 60.0,
"upper_bound": 100.0
},
"location": "a57efe5f145f498c9be62a9b63626fbf",
"model": "Generic heater/cooler",
"name": "OpenTherm",
"sensors": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,24 @@
"flame_state": false,
"heating_state": false
},
"boiler_temperature": {
"current": 25.3,
"lower_bound": 25.0,
"resolution": 0.01,
"setpoint": 40.0,
"upper_bound": 45.0
},
"dev_class": "heater_central",
"dhw_mode": "auto",
"dhw_modes": ["off", "auto", "boost", "eco", "comfort"],
"location": "674b657c138a41a291d315d7471deb06",
"max_dhw_temperature": {
"dhw_temperature": {
"current": 52.9,
"lower_bound": 35.0,
"resolution": 0.01,
"setpoint": 53.0,
"upper_bound": 60.0
},
"maximum_boiler_temperature": {
"current": 25.3,
"lower_bound": 25.0,
"resolution": 0.01,
"setpoint": 40.0,
"upper_bound": 45.0
},
"location": "674b657c138a41a291d315d7471deb06",
"model": "Generic heater/cooler",
"model_id": "173",
"name": "OpenTherm",
Expand Down
6 changes: 3 additions & 3 deletions tests/components/plugwise/fixtures/legacy_anna/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"flame_state": true,
"heating_state": true
},
"dev_class": "heater_central",
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
"maximum_boiler_temperature": {
"boiler_temperature": {
"current": 23.6,
"lower_bound": 50.0,
"resolution": 1.0,
"setpoint": 50.0,
"upper_bound": 90.0
},
"dev_class": "heater_central",
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
"model": "Generic heater",
"name": "OpenTherm",
"sensors": {
Expand Down
8 changes: 4 additions & 4 deletions tests/components/plugwise/fixtures/m_adam_cooling/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"flame_state": false,
"heating_state": false
},
"dev_class": "heater_central",
"dhw_modes": ["comfort", "eco"],
"location": "bc93488efab249e5bc54fd7e175a6f91",
"maximum_boiler_temperature": {
"boiler_temperature": {
"current": 19.0,
"lower_bound": 25.0,
"resolution": 0.01,
"setpoint": 50.0,
"upper_bound": 95.0
},
"dev_class": "heater_central",
"dhw_modes": ["comfort", "eco"],
"location": "bc93488efab249e5bc54fd7e175a6f91",
"model": "Generic heater",
"name": "OpenTherm",
"select_dhw_mode": "eco",
Expand Down
18 changes: 9 additions & 9 deletions tests/components/plugwise/fixtures/m_adam_heating/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
"flame_state": false,
"heating_state": true
},
"boiler_temperature": {
"current": 37.0,
"lower_bound": 25.0,
"resolution": 0.01,
"setpoint": 50.0,
"upper_bound": 95.0
},
"dev_class": "heater_central",
"dhw_mode": "eco",
"dhw_modes": ["comfort", "eco"],
"location": "bc93488efab249e5bc54fd7e175a6f91",
"max_dhw_temperature": {
"dhw_temperature": {
"current": 37.0,
"lower_bound": 40.0,
"resolution": 0.01,
"setpoint": 60.0,
"upper_bound": 60.0
},
"maximum_boiler_temperature": {
"current": 37.0,
"lower_bound": 25.0,
"resolution": 0.01,
"setpoint": 50.0,
"upper_bound": 95.0
},
"location": "bc93488efab249e5bc54fd7e175a6f91",
"model": "Generic heater",
"name": "OpenTherm",
"sensors": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
"flame_state": false,
"heating_state": false
},
"boiler_temperature": {
"current": 37.0,
"lower_bound": 25.0,
"resolution": 0.01,
"setpoint": 50.0,
"upper_bound": 95.0
},
"dev_class": "heater_central",
"dhw_mode": "eco",
"dhw_modes": ["comfort", "eco"],
"location": "bc93488efab249e5bc54fd7e175a6f91",
"max_dhw_temperature": {
"dhw_temperature": {
"current": 37.0,
"lower_bound": 40.0,
"resolution": 0.01,
"setpoint": 60.0,
"upper_bound": 60.0
},
"maximum_boiler_temperature": {
"current": 37.0,
"lower_bound": 25.0,
"resolution": 0.01,
"setpoint": 50.0,
"upper_bound": 95.0
},
"location": "bc93488efab249e5bc54fd7e175a6f91",
"model": "Generic heater",
"name": "OpenTherm",
"sensors": {
Expand Down
18 changes: 9 additions & 9 deletions tests/components/plugwise/fixtures/m_adam_jip/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -327,24 +327,24 @@
"flame_state": false,
"heating_state": false
},
"boiler_temperature": {
"current": 37.3,
"lower_bound": 20.0,
"resolution": 0.01,
"setpoint": 90.0,
"upper_bound": 90.0
},
"dev_class": "heater_central",
"dhw_mode": "eco",
"dhw_modes": ["comfort", "eco"],
"location": "9e4433a9d69f40b3aefd15e74395eaec",
"max_dhw_temperature": {
"dhw_temperature": {
"current": 37.3,
"lower_bound": 40.0,
"resolution": 0.01,
"setpoint": 60.0,
"upper_bound": 60.0
},
"maximum_boiler_temperature": {
"current": 37.3,
"lower_bound": 20.0,
"resolution": 0.01,
"setpoint": 90.0,
"upper_bound": 90.0
},
"location": "9e4433a9d69f40b3aefd15e74395eaec",
"model": "Generic heater",
"model_id": "10.20",
"name": "OpenTherm",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
"heating_state": false,
"secondary_boiler_state": false
},
"boiler_temperature": {
"current": 22.7,
"lower_bound": 0.0,
"resolution": 1.0,
"setpoint": 60.0,
"upper_bound": 100.0
},
"dev_class": "heater_central",
"dhw_mode": "eco",
"dhw_modes": ["comfort", "eco"],
"location": "a57efe5f145f498c9be62a9b63626fbf",
"max_dhw_temperature": {
"dhw_temperature": {
"current": 41.5,
"lower_bound": 35.0,
"resolution": 0.01,
"setpoint": 53.0,
"upper_bound": 60.0
},
"maximum_boiler_temperature": {
"current": 22.7,
"lower_bound": 0.0,
"resolution": 1.0,
"setpoint": 60.0,
"upper_bound": 100.0
},
"location": "a57efe5f145f498c9be62a9b63626fbf",
"model": "Generic heater/cooler",
"name": "OpenTherm",
"sensors": {
Expand Down
4 changes: 2 additions & 2 deletions tests/components/plugwise/test_number.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ async def test_adam_dhw_setpoint_change(

assert mock_smile_adam_heat_cool.set_number.call_count == 1
mock_smile_adam_heat_cool.set_number.assert_called_with(
"056ee145a816487eaa69243c3280f8bf", "max_dhw_temperature", 55.0
"056ee145a816487eaa69243c3280f8bf", "dhw_temperature", 55.0
)


Expand Down Expand Up @@ -128,5 +128,5 @@ async def test_anna_max_boiler_temp_change(

assert mock_smile_anna.set_number.call_count == 1
mock_smile_anna.set_number.assert_called_with(
"1cbf783bb11e4a7c8a6843dee3a86927", "maximum_boiler_temperature", 65.0
"1cbf783bb11e4a7c8a6843dee3a86927", "boiler_temperature", 65.0
)
Loading