Skip to content

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

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 3 commits into from
Oct 25, 2025
Merged

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

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
174b0f7
Use async_update_and_abort in mqtt (#155140)
gjohansson-ST Oct 25, 2025
98bffdb
Bump aioshelly to version 13.15.0 (#155150)
bieniu Oct 25, 2025
750f063
Bump israel-rail-api to 0.1.4 (#155153)
shaiu Oct 25, 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
2 changes: 1 addition & 1 deletion homeassistant/components/israel_rail/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/israel_rail",
"iot_class": "cloud_polling",
"loggers": ["israelrailapi"],
"requirements": ["israel-rail-api==0.1.3"]
"requirements": ["israel-rail-api==0.1.4"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/mqtt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ async def _async_config_entry_updated(hass: HomeAssistant, entry: ConfigEntry) -

Causes for this is config entry options changing.
"""
await hass.config_entries.async_reload(entry.entry_id)
hass.config_entries.async_schedule_reload(entry.entry_id)


@callback
Expand Down
6 changes: 2 additions & 4 deletions homeassistant/components/mqtt/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3815,9 +3815,7 @@ async def async_step_reauth_confirm(
try_connection,
new_entry_data,
):
return self.async_update_reload_and_abort(
reauth_entry, data=new_entry_data
)
return self.async_update_and_abort(reauth_entry, data=new_entry_data)

errors["base"] = "invalid_auth"

Expand Down Expand Up @@ -3863,7 +3861,7 @@ async def async_step_broker(

if can_connect:
if is_reconfigure:
return self.async_update_reload_and_abort(
return self.async_update_and_abort(
reconfigure_entry,
data=validated_user_input,
)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/shelly/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"iot_class": "local_push",
"loggers": ["aioshelly"],
"quality_scale": "silver",
"requirements": ["aioshelly==13.14.0"],
"requirements": ["aioshelly==13.15.0"],
"zeroconf": [
{
"type": "_http._tcp.local.",
Expand Down
4 changes: 2 additions & 2 deletions 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.

4 changes: 2 additions & 2 deletions 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.

Loading