Skip to content

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

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 5 commits into from
Oct 20, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fef19c
Bump bring-api to v1.1.1 (#154854)
tr4nt0r Oct 20, 2025
fedeca1
Bump aioamazondevices to 6.4.6 (#154865)
chemelli74 Oct 20, 2025
5dcb68c
Add device model information for Nintendo Parental Controls (#154867)
pantherale0 Oct 20, 2025
2a5cf83
Disable parallel updates for Nintendo Parental Controls (#154866)
pantherale0 Oct 20, 2025
23e7b14
Update RestrictedPython to 8.1 (#154870)
cdce8p Oct 20, 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/alexa_devices/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"iot_class": "cloud_polling",
"loggers": ["aioamazondevices"],
"quality_scale": "platinum",
"requirements": ["aioamazondevices==6.4.4"]
"requirements": ["aioamazondevices==6.4.6"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/bring/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"iot_class": "cloud_polling",
"loggers": ["bring_api"],
"quality_scale": "platinum",
"requirements": ["bring-api==1.1.0"]
"requirements": ["bring-api==1.1.1"]
}
2 changes: 2 additions & 0 deletions homeassistant/components/nintendo_parental_controls/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ def __init__(
manufacturer="Nintendo",
name=device.name,
sw_version=device.extra["firmwareVersion"]["displayedVersion"],
model=device.model,
model_id=device.generation,
)

async def async_added_to_hass(self) -> None:
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/nintendo_parental_controls/number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from .coordinator import NintendoParentalControlsConfigEntry, NintendoUpdateCoordinator
from .entity import Device, NintendoDevice

PARALLEL_UPDATES = 0
PARALLEL_UPDATES = 1


class NintendoParentalNumber(StrEnum):
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/nintendo_parental_controls/switch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from .coordinator import NintendoParentalControlsConfigEntry, NintendoUpdateCoordinator
from .entity import Device, NintendoDevice

PARALLEL_UPDATES = 0
PARALLEL_UPDATES = 1


class NintendoParentalSwitch(StrEnum):
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/nintendo_parental_controls/time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
_LOGGER = logging.getLogger(__name__)

# Coordinator is used to centralize the data updates
PARALLEL_UPDATES = 0
PARALLEL_UPDATES = 1


class NintendoParentalControlsTime(StrEnum):
Expand Down
5 changes: 1 addition & 4 deletions homeassistant/components/python_script/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@
"documentation": "https://www.home-assistant.io/integrations/python_script",
"loggers": ["RestrictedPython"],
"quality_scale": "internal",
"requirements": [
"RestrictedPython==8.0;python_version<'3.14'",
"RestrictedPython==8.1a1.dev0;python_version>='3.14'"
]
"requirements": ["RestrictedPython==8.1"]
}
9 changes: 3 additions & 6 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.

9 changes: 3 additions & 6 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.

2 changes: 2 additions & 0 deletions tests/components/nintendo_parental_controls/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ def mock_nintendo_device() -> Device:
mock.set_bedtime_alarm.return_value = None
mock.update_max_daily_playtime.return_value = None
mock.forced_termination_mode = True
mock.model = "Test Model"
mock.generation = "P00"
return mock


Expand Down
Loading