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/auth/mfa_modules/notify.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
SetupFlow,
)

REQUIREMENTS = ["pyotp==2.8.0"]
REQUIREMENTS = ["pyotp==2.9.0"]

CONF_MESSAGE = "message"

Expand Down
2 changes: 1 addition & 1 deletion homeassistant/auth/mfa_modules/totp.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
SetupFlow,
)

REQUIREMENTS = ["pyotp==2.8.0", "PyQRCode==1.2.1"]
REQUIREMENTS = ["pyotp==2.9.0", "PyQRCode==1.2.1"]

CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({}, extra=vol.PREVENT_EXTRA)

Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/bluesound/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/bluesound",
"iot_class": "local_polling",
"requirements": ["pyblu==2.0.4"],
"requirements": ["pyblu==2.0.5"],
"zeroconf": [
{
"type": "_musc._tcp.local."
Expand Down
14 changes: 10 additions & 4 deletions homeassistant/components/bluesound/media_player.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,14 @@ def source_list(self) -> list[str] | None:
if self.available is False or (self.is_grouped and not self.is_leader):
return None

sources = [x.text for x in self._inputs]
sources += [x.name for x in self._presets]
sources = [x.name for x in self._presets]

# ignore if both id and text are None
for input_ in self._inputs:
if input_.text is not None:
sources.append(input_.text)
elif input_.id is not None:
sources.append(input_.id)

return sources

Expand All @@ -340,7 +346,7 @@ def source(self) -> str | None:
input_.id == self._status.input_id
or input_.url == self._status.stream_url
):
return input_.text
return input_.text if input_.text is not None else input_.id

for preset in self._presets:
if preset.url == self._status.stream_url:
Expand Down Expand Up @@ -537,7 +543,7 @@ async def async_select_source(self, source: str) -> None:

# presets and inputs might have the same name; presets have priority
for input_ in self._inputs:
if input_.text == source:
if source in (input_.text, input_.id):
await self._player.play_url(input_.url)
return
for preset in self._presets:
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/habitica/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"iot_class": "cloud_polling",
"loggers": ["habiticalib"],
"quality_scale": "platinum",
"requirements": ["habiticalib==0.4.4"]
"requirements": ["habiticalib==0.4.5"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/mill/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"documentation": "https://www.home-assistant.io/integrations/mill",
"iot_class": "local_polling",
"loggers": ["mill", "mill_local"],
"requirements": ["millheater==0.12.5", "mill-local==0.3.0"]
"requirements": ["millheater==0.13.1", "mill-local==0.3.0"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/ohme/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"integration_type": "device",
"iot_class": "cloud_polling",
"quality_scale": "platinum",
"requirements": ["ohme==1.5.1"]
"requirements": ["ohme==1.5.2"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/otp/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"iot_class": "local_polling",
"loggers": ["pyotp"],
"quality_scale": "internal",
"requirements": ["pyotp==2.8.0"]
"requirements": ["pyotp==2.9.0"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/schlage/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/schlage",
"iot_class": "cloud_polling",
"requirements": ["pyschlage==2025.7.3"]
"requirements": ["pyschlage==2025.9.0"]
}
12 changes: 6 additions & 6 deletions requirements_all.txt

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

12 changes: 6 additions & 6 deletions requirements_test_all.txt

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

3 changes: 3 additions & 0 deletions tests/components/bluesound/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ async def generate(host: str) -> "PlayerMockData":
return_value=[
Input("1", "input1", "image1", "url1"),
Input("2", "input2", "image2", "url2"),
Input(None, "input3", "image3", "url3"),
Input("4", None, "image4", "url4"),
Input(None, None, "image5", "url5"),
]
)
player.presets = AsyncMock(
Expand Down
6 changes: 4 additions & 2 deletions tests/components/bluesound/snapshots/test_media_player.ambr
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
'media_title': 'song',
'shuffle': False,
'source_list': list([
'input1',
'input2',
'preset1',
'preset2',
'input1',
'input2',
'input3',
'4',
]),
'supported_features': <MediaPlayerEntityFeature: 196157>,
'volume_level': 0.1,
Expand Down
19 changes: 16 additions & 3 deletions tests/components/bluesound/test_media_player.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,30 @@ async def test_volume_down(
player_mocks.player_data.player.volume.assert_called_once_with(level=9)


@pytest.mark.parametrize(
("input", "url"),
[
("input1", "url1"),
("input2", "url2"),
("input3", "url3"),
("4", "url4"),
],
)
async def test_select_input_source(
hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
hass: HomeAssistant,
setup_config_entry: None,
player_mocks: PlayerMocks,
input: str,
url: str,
) -> None:
"""Test the media player select input source."""
await hass.services.async_call(
MEDIA_PLAYER_DOMAIN,
SERVICE_SELECT_SOURCE,
{ATTR_ENTITY_ID: "media_player.player_name1111", ATTR_INPUT_SOURCE: "input1"},
{ATTR_ENTITY_ID: "media_player.player_name1111", ATTR_INPUT_SOURCE: input},
)

player_mocks.player_data.player.play_url.assert_called_once_with("url1")
player_mocks.player_data.player.play_url.assert_called_once_with(url)


async def test_select_preset_source(
Expand Down
Loading