Merge pull request #36885 from home-assistant/rc

homeassistant/components/axis/manifest.json

@@ -3,7 +3,7 @@
   "name": "Axis",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/axis",
-  "requirements": ["axis==30"],
+  "requirements": ["axis==31"],
   "zeroconf": ["_axis-video._tcp.local."],
   "after_dependencies": ["mqtt"],
   "codeowners": ["@Kane610"]

homeassistant/components/daikin/config_flow.py

@@ -128,8 +128,8 @@ class FlowHandler(config_entries.ConfigFlow):
 
     async def async_step_zeroconf(self, discovery_info):
         """Prepare configuration for a discovered Daikin device."""
-        _LOGGER.debug("Zeroconf discovery_info: %s", discovery_info)
+        _LOGGER.debug("Zeroconf user_input: %s", discovery_info)
-        devices = Discovery.poll(discovery_info[CONF_HOST])
+        devices = Discovery().poll(discovery_info[CONF_HOST])
         await self.async_set_unique_id(next(iter(devices.values()))[KEY_MAC])
         self._abort_if_unique_id_configured()
         self.host = discovery_info[CONF_HOST]

homeassistant/components/llamalab_automate/notify.py

@@ -51,7 +51,7 @@ class AutomateNotificationService(BaseNotificationService):
 
         # Extract params from data dict
         data = dict(kwargs.get(ATTR_DATA) or {})
-        priority = data.get(ATTR_PRIORITY, "Normal")
+        priority = data.get(ATTR_PRIORITY, "normal").lower()
 
         _LOGGER.debug(
             "Sending to: %s, %s, prio: %s", self._recipient, str(self._device), priority

homeassistant/components/met/manifest.json

@@ -3,6 +3,6 @@
   "name": "Meteorologisk institutt (Met.no)",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/met",
-  "requirements": ["pyMetno==0.4.6"],
+  "requirements": ["pyMetno==0.5.1"],
   "codeowners": ["@danielhiversen"]
 }

homeassistant/components/norway_air/manifest.json

@@ -2,6 +2,6 @@
   "domain": "norway_air",
   "name": "Om Luftkvalitet i Norge (Norway Air)",
   "documentation": "https://www.home-assistant.io/integrations/norway_air",
-  "requirements": ["pyMetno==0.4.6"],
+  "requirements": ["pyMetno==0.5.1"],
   "codeowners": []
 }

homeassistant/components/yr/sensor.py

@@ -21,7 +21,7 @@ from homeassistant.const import (
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_TEMPERATURE,
-    HTTP_OK,
+    HTTP_BAD_REQUEST,
     PRESSURE_HPA,
     SPEED_METERS_PER_SECOND,
     TEMP_CELSIUS,
@@ -187,7 +187,7 @@ class YrData:
             websession = async_get_clientsession(self.hass)
             with async_timeout.timeout(10):
                 resp = await websession.get(self._url, params=self._urlparams)
-            if resp.status != HTTP_OK:
+            if resp.status >= HTTP_BAD_REQUEST:
                 try_again(f"{resp.url} returned {resp.status}")
                 return
             text = await resp.text()

homeassistant/const.py

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

requirements_all.txt

@@ -306,7 +306,7 @@ avea==1.4
 avri-api==0.1.7
 
 # homeassistant.components.axis
-axis==30
+axis==31
 
 # homeassistant.components.azure_event_hub
 azure-eventhub==5.1.0
@@ -1170,7 +1170,7 @@ pyHS100==0.3.5
 
 # homeassistant.components.met
 # homeassistant.components.norway_air
-pyMetno==0.4.6
+pyMetno==0.5.1
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.25

requirements_test_all.txt

@@ -147,7 +147,7 @@ async-upnp-client==0.14.13
 av==8.0.2
 
 # homeassistant.components.axis
-axis==30
+axis==31
 
 # homeassistant.components.homekit
 base36==0.1.1
@@ -503,7 +503,7 @@ pyHS100==0.3.5
 
 # homeassistant.components.met
 # homeassistant.components.norway_air
-pyMetno==0.4.6
+pyMetno==0.5.1
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.25

tests/components/daikin/test_config_flow.py

@@ -45,9 +45,9 @@ def mock_daikin():
 def mock_daikin_discovery():
     """Mock pydaikin Discovery."""
     with patch("homeassistant.components.daikin.config_flow.Discovery") as Discovery:
-        Discovery.poll = PropertyMock(
+        Discovery().poll.return_value = {
-            return_value={"127.0.01": {"mac": "AABBCCDDEEFF", "id": "test"}}
+            "127.0.01": {"mac": "AABBCCDDEEFF", "id": "test"}
-        )
+        }
         yield Discovery