Skip to content

[pull] dev from home-assistant:dev #933

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

Merged
merged 2 commits into from
Jul 21, 2025
Merged

[pull] dev from home-assistant:dev #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77a954d
Use OptionsFlowWithReload in reolink (#149132)
gjohansson-ST Jul 20, 2025
0a9fbb2
Bump uiprotect to version 7.16.0 (#149146)
RaHehl Jul 21, 2025
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
11 changes: 0 additions & 11 deletions homeassistant/components/reolink/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,6 @@ async def async_check_firmware_update() -> None:

await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)

config_entry.async_on_unload(
config_entry.add_update_listener(entry_update_listener)
)

return True


Expand Down Expand Up @@ -295,13 +291,6 @@ def async_camera_wake() -> None:
)


async def entry_update_listener(
hass: HomeAssistant, config_entry: ReolinkConfigEntry
) -> None:
"""Update the configuration of the host entity."""
await hass.config_entries.async_reload(config_entry.entry_id)


async def async_unload_entry(
hass: HomeAssistant, config_entry: ReolinkConfigEntry
) -> bool:
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/reolink/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
SOURCE_RECONFIGURE,
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
OptionsFlowWithReload,
)
from homeassistant.const import (
CONF_HOST,
Expand Down Expand Up @@ -61,7 +61,7 @@
API_STARTUP_TIME = 5


class ReolinkOptionsFlowHandler(OptionsFlow):
class ReolinkOptionsFlowHandler(OptionsFlowWithReload):
"""Handle Reolink options."""

async def async_step_init(
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/unifiprotect/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"integration_type": "hub",
"iot_class": "local_push",
"loggers": ["uiprotect", "unifi_discovery"],
"requirements": ["uiprotect==7.15.1", "unifi-discovery==1.2.0"],
"requirements": ["uiprotect==7.16.0", "unifi-discovery==1.2.0"],
"ssdp": [
{
"manufacturer": "Ubiquiti Networks",
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop

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

20 changes: 0 additions & 20 deletions tests/components/reolink/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,26 +180,6 @@ async def test_credential_error_three(
assert (HOMEASSISTANT_DOMAIN, issue_id) in issue_registry.issues


async def test_entry_reloading(
hass: HomeAssistant,
config_entry: MockConfigEntry,
reolink_host: MagicMock,
) -> None:
"""Test the entry is reloaded correctly when settings change."""
reolink_host.is_nvr = False
assert await hass.config_entries.async_setup(config_entry.entry_id)
await hass.async_block_till_done()

assert reolink_host.logout.call_count == 0
assert config_entry.title == "test_reolink_name"

hass.config_entries.async_update_entry(config_entry, title="New Name")
await hass.async_block_till_done()

assert reolink_host.logout.call_count == 1
assert config_entry.title == "New Name"


@pytest.mark.parametrize(
("attr", "value", "expected_models"),
[
Expand Down
Loading