Merge pull request #50507 from home-assistant/rc

homeassistant/components/denonavr/manifest.json

@@ -3,7 +3,7 @@
   "name": "Denon AVR Network Receivers",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/denonavr",
-  "requirements": ["denonavr==0.10.7"],
+  "requirements": ["denonavr==0.10.8"],
   "codeowners": ["@scarface-4711", "@starkillerOG"],
   "ssdp": [
     {

homeassistant/components/hue/manifest.json

@@ -3,7 +3,7 @@
   "name": "Philips Hue",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/hue",
-  "requirements": ["aiohue==2.3.0"],
+  "requirements": ["aiohue==2.3.1"],
   "ssdp": [
     {
       "manufacturer": "Royal Philips Electronics",

homeassistant/components/sonos/media_player.py

@@ -454,7 +454,8 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
 
     async def async_reconnect_player(self) -> None:
         """Set basic information when player is reconnected."""
-        await self.hass.async_add_executor_job(self._reconnect_player)
+        async with self.data.topology_condition:
+            await self.hass.async_add_executor_job(self._reconnect_player)
 
     def _reconnect_player(self) -> None:
         """Set basic information when player is reconnected."""
@@ -498,9 +499,14 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
         if new_status == "TRANSITIONING":
             return
 
-        self._play_mode = (
+        if variables and "transport_state" in variables:
-            variables["current_play_mode"] if variables else self.soco.play_mode
+            self._play_mode = variables["current_play_mode"]
-        )
+            track_uri = variables["current_track_uri"]
+            music_source = self.soco.music_source_from_uri(track_uri)
+        else:
+            self._play_mode = self.soco.play_mode
+            music_source = self.soco.music_source
+
         self._uri = None
         self._media_duration = None
         self._media_image_url = None
@@ -514,13 +520,6 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
         update_position = new_status != self._status
         self._status = new_status
 
-        if variables:
-            track_uri = variables["current_track_uri"]
-            music_source = self.soco.music_source_from_uri(track_uri)
-        else:
-            # This causes a network round-trip so we avoid it when possible
-            music_source = self.soco.music_source
-
         if music_source == MUSIC_SRC_TV:
             self.update_media_linein(SOURCE_TV)
         elif music_source == MUSIC_SRC_LINE_IN:
@@ -556,7 +555,7 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
         self._media_title = source
         self._source_name = source
 
-    def update_media_radio(self, variables: dict) -> None:
+    def update_media_radio(self, variables: dict | None) -> None:
         """Update state when streaming radio."""
         self._clear_media_position()
 

homeassistant/const.py

@@ -1,7 +1,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 2021
 MINOR_VERSION = 5
-PATCH_VERSION = "2"
+PATCH_VERSION = "3"
 __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__ = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER = (3, 8, 0)

homeassistant/helpers/script.py

@@ -193,6 +193,9 @@ async def trace_action(hass, script_run, stop, variables):
 
     try:
         yield trace_element
+    except _StopScript as ex:
+        trace_element.set_error(ex.__cause__ or ex)
+        raise ex
     except Exception as ex:
         trace_element.set_error(ex)
         raise ex

requirements_all.txt

@@ -182,7 +182,7 @@ aiohomekit==0.2.61
 aiohttp_cors==0.7.0
 
 # homeassistant.components.hue
-aiohue==2.3.0
+aiohue==2.3.1
 
 # homeassistant.components.imap
 aioimaplib==0.7.15
@@ -479,7 +479,7 @@ defusedxml==0.6.0
 deluge-client==1.7.1
 
 # homeassistant.components.denonavr
-denonavr==0.10.7
+denonavr==0.10.8
 
 # homeassistant.components.devolo_home_control
 devolo-home-control-api==0.17.3

requirements_test_all.txt

@@ -119,7 +119,7 @@ aiohomekit==0.2.61
 aiohttp_cors==0.7.0
 
 # homeassistant.components.hue
-aiohue==2.3.0
+aiohue==2.3.1
 
 # homeassistant.components.apache_kafka
 aiokafka==0.6.0
@@ -264,7 +264,7 @@ debugpy==1.2.1
 defusedxml==0.6.0
 
 # homeassistant.components.denonavr
-denonavr==0.10.7
+denonavr==0.10.8
 
 # homeassistant.components.devolo_home_control
 devolo-home-control-api==0.17.3

tests/helpers/test_script.py

@@ -622,7 +622,7 @@ async def test_delay_template_invalid(hass, caplog):
     assert_action_trace(
         {
             "0": [{"result": {"event": "test_event", "event_data": {}}}],
-            "1": [{"error_type": script._StopScript}],
+            "1": [{"error_type": vol.MultipleInvalid}],
         },
         expected_script_execution="aborted",
     )
@@ -683,7 +683,7 @@ async def test_delay_template_complex_invalid(hass, caplog):
     assert_action_trace(
         {
             "0": [{"result": {"event": "test_event", "event_data": {}}}],
-            "1": [{"error_type": script._StopScript}],
+            "1": [{"error_type": vol.MultipleInvalid}],
         },
         expected_script_execution="aborted",
     )
@@ -1138,7 +1138,7 @@ async def test_wait_continue_on_timeout(
     }
     if continue_on_timeout is False:
         expected_trace["0"][0]["result"]["timeout"] = True
-        expected_trace["0"][0]["error_type"] = script._StopScript
+        expected_trace["0"][0]["error_type"] = asyncio.TimeoutError
         expected_script_execution = "aborted"
     else:
         expected_trace["1"] = [