From f823afeadc38473218ec475393e455d2e3c8c760 Mon Sep 17 00:00:00 2001 From: fb22 <4872297+fb22@users.noreply.github.com> Date: Tue, 16 Jun 2020 12:42:12 +0200 Subject: [PATCH 1/7] Fix llamalab_automate notify priority (#36845) --- homeassistant/components/llamalab_automate/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/llamalab_automate/notify.py b/homeassistant/components/llamalab_automate/notify.py index b4ed9a4e628..b94ffa099be 100644 --- a/homeassistant/components/llamalab_automate/notify.py +++ b/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 From ec69edcb7993635da10c1fc1416665f126f9436a Mon Sep 17 00:00:00 2001 From: Robert Svensson Date: Wed, 17 Jun 2020 20:07:19 +0200 Subject: [PATCH 2/7] Bump Axis dependency to fix issue where ports dont initialize (#36860) --- homeassistant/components/axis/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/axis/manifest.json b/homeassistant/components/axis/manifest.json index 0bc6afd292f..ea5b024e8fb 100644 --- a/homeassistant/components/axis/manifest.json +++ b/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"] diff --git a/requirements_all.txt b/requirements_all.txt index 9c4ada0268e..e1c732d6cc9 100644 --- a/requirements_all.txt +++ b/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 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 7dd4eea8262..df92f752097 100644 --- a/requirements_test_all.txt +++ b/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 From 625c2aa19d1fa49baf1f201ae3bd0b25e154df86 Mon Sep 17 00:00:00 2001 From: Fredrik Erlandsson Date: Wed, 17 Jun 2020 16:53:29 +0200 Subject: [PATCH 3/7] Fix Daikin zeroconf discovery flow error (#36868) --- homeassistant/components/daikin/config_flow.py | 2 +- tests/components/daikin/test_config_flow.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py index 67411bfdff0..a26e2e1c05b 100644 --- a/homeassistant/components/daikin/config_flow.py +++ b/homeassistant/components/daikin/config_flow.py @@ -128,7 +128,7 @@ 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]) await self.async_set_unique_id(next(iter(devices.values()))[KEY_MAC]) self._abort_if_unique_id_configured() diff --git a/tests/components/daikin/test_config_flow.py b/tests/components/daikin/test_config_flow.py index 9702e5ad2c7..f8d13bdd355 100644 --- a/tests/components/daikin/test_config_flow.py +++ b/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( - return_value={"127.0.01": {"mac": "AABBCCDDEEFF", "id": "test"}} - ) + Discovery().poll.return_value = { + "127.0.01": {"mac": "AABBCCDDEEFF", "id": "test"} + } yield Discovery From 7547a924794a08213d929fa26121a2ed62cfb9dd Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 17 Jun 2020 12:12:50 -0700 Subject: [PATCH 4/7] Upgrade pymetno (#36880) --- homeassistant/components/met/manifest.json | 2 +- homeassistant/components/norway_air/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/met/manifest.json b/homeassistant/components/met/manifest.json index baf2c1b7e3e..f4f32a5097f 100644 --- a/homeassistant/components/met/manifest.json +++ b/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"] } diff --git a/homeassistant/components/norway_air/manifest.json b/homeassistant/components/norway_air/manifest.json index 515d4eea6bb..d815482c3f0 100644 --- a/homeassistant/components/norway_air/manifest.json +++ b/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": [] } diff --git a/requirements_all.txt b/requirements_all.txt index e1c732d6cc9..a0adb50f656 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -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 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index df92f752097..c932bc872d1 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -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 From 3e14b2dc612d6d08322d3862dcd8cf465e3286c8 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 17 Jun 2020 12:53:30 -0700 Subject: [PATCH 5/7] Bumped version to 0.111.4 --- homeassistant/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/const.py b/homeassistant/const.py index 093b39d6d1b..d73e7139ff6 100644 --- a/homeassistant/const.py +++ b/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) From 098d82f4d3a6f51250402a8c1bb671e5c9002bbc Mon Sep 17 00:00:00 2001 From: Phil Bruckner Date: Wed, 17 Jun 2020 15:40:04 -0500 Subject: [PATCH 6/7] Fix yr HTTP error handling (#36889) --- homeassistant/components/yr/sensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/yr/sensor.py b/homeassistant/components/yr/sensor.py index 58a04ce62a6..8d7a91f24da 100644 --- a/homeassistant/components/yr/sensor.py +++ b/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() From b4b2302e04a0d31f8c443ef545fcd1ec0d3e6834 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 17 Jun 2020 16:23:10 -0700 Subject: [PATCH 7/7] Fix test --- homeassistant/components/daikin/config_flow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py index a26e2e1c05b..70553df2d91 100644 --- a/homeassistant/components/daikin/config_flow.py +++ b/homeassistant/components/daikin/config_flow.py @@ -129,7 +129,7 @@ class FlowHandler(config_entries.ConfigFlow): async def async_step_zeroconf(self, discovery_info): """Prepare configuration for a discovered Daikin device.""" _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]