From fe92cf1e72baab9952a1a65b38550b3fdd7647bc Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 11 Jan 2019 11:48:32 -0800 Subject: [PATCH 1/6] Updated frontend to 20190109.1 --- homeassistant/components/frontend/__init__.py | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py index 478ff5549d9..026311f1397 100644 --- a/homeassistant/components/frontend/__init__.py +++ b/homeassistant/components/frontend/__init__.py @@ -24,7 +24,7 @@ from homeassistant.core import callback from homeassistant.helpers.translation import async_get_translations from homeassistant.loader import bind_hass -REQUIREMENTS = ['home-assistant-frontend==20190109.0'] +REQUIREMENTS = ['home-assistant-frontend==20190109.1'] DOMAIN = 'frontend' DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log', diff --git a/requirements_all.txt b/requirements_all.txt index 15725711619..58fbb1bd5be 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -511,7 +511,7 @@ hole==0.3.0 holidays==0.9.8 # homeassistant.components.frontend -home-assistant-frontend==20190109.0 +home-assistant-frontend==20190109.1 # homeassistant.components.zwave homeassistant-pyozw==0.1.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index ebee97e43c2..7595cf2f8c7 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -104,7 +104,7 @@ hdate==0.7.5 holidays==0.9.8 # homeassistant.components.frontend -home-assistant-frontend==20190109.0 +home-assistant-frontend==20190109.1 # homeassistant.components.homematicip_cloud homematicip==0.9.8 From 7a83b86ebd5fc0d110319d1ea613718387083aac Mon Sep 17 00:00:00 2001 From: "David F. Mulcahey" Date: Fri, 4 Jan 2019 14:00:26 -0500 Subject: [PATCH 2/6] check config instead of config_entry for quirks flag (#19730) --- homeassistant/components/zha/__init__.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py index 5ad06565b00..3fe8980c451 100644 --- a/homeassistant/components/zha/__init__.py +++ b/homeassistant/components/zha/__init__.py @@ -95,8 +95,7 @@ async def async_setup(hass, config): context={'source': config_entries.SOURCE_IMPORT}, data={ CONF_USB_PATH: conf[CONF_USB_PATH], - CONF_RADIO_TYPE: conf.get(CONF_RADIO_TYPE).value, - ENABLE_QUIRKS: conf[ENABLE_QUIRKS] + CONF_RADIO_TYPE: conf.get(CONF_RADIO_TYPE).value } )) return True @@ -107,17 +106,17 @@ async def async_setup_entry(hass, config_entry): Will automatically load components to support devices found on the network. """ - if config_entry.data.get(ENABLE_QUIRKS): - # needs to be done here so that the ZHA module is finished loading - # before zhaquirks is imported - # pylint: disable=W0611, W0612 - import zhaquirks # noqa - hass.data[DATA_ZHA] = hass.data.get(DATA_ZHA, {}) hass.data[DATA_ZHA][DATA_ZHA_DISPATCHERS] = [] config = hass.data[DATA_ZHA].get(DATA_ZHA_CONFIG, {}) + if config.get(ENABLE_QUIRKS, True): + # needs to be done here so that the ZHA module is finished loading + # before zhaquirks is imported + # pylint: disable=W0611, W0612 + import zhaquirks # noqa + usb_path = config_entry.data.get(CONF_USB_PATH) baudrate = config.get(CONF_BAUDRATE, DEFAULT_BAUDRATE) radio_type = config_entry.data.get(CONF_RADIO_TYPE) From ded37d971d032ef384c2baef0ad86795b490873a Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 10 Jan 2019 14:43:24 -0500 Subject: [PATCH 3/6] Don't map LevelControl to light for single cluster devices. (#19929) --- homeassistant/components/zha/const.py | 1 - 1 file changed, 1 deletion(-) diff --git a/homeassistant/components/zha/const.py b/homeassistant/components/zha/const.py index 3e7f9f89f91..5b650c95cc4 100644 --- a/homeassistant/components/zha/const.py +++ b/homeassistant/components/zha/const.py @@ -129,7 +129,6 @@ def populate_data(): SINGLE_INPUT_CLUSTER_DEVICE_CLASS.update({ zcl.clusters.general.OnOff: 'switch', - zcl.clusters.general.LevelControl: 'light', zcl.clusters.measurement.RelativeHumidity: 'sensor', zcl.clusters.measurement.TemperatureMeasurement: 'sensor', zcl.clusters.measurement.PressureMeasurement: 'sensor', From 0979ce476ab039cb1cc6b68e8bc313c94ed3a39a Mon Sep 17 00:00:00 2001 From: Daniel Shokouhi Date: Thu, 10 Jan 2019 13:56:10 -0800 Subject: [PATCH 4/6] Fix botvac connected alert retrieval --- homeassistant/components/vacuum/neato.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py index 0c97f99df99..37d4783cdbd 100644 --- a/homeassistant/components/vacuum/neato.py +++ b/homeassistant/components/vacuum/neato.py @@ -82,7 +82,10 @@ class NeatoConnectedVacuum(StateVacuumDevice): self._available = False return _LOGGER.debug('self._state=%s', self._state) - robot_alert = ALERTS.get(self._state['alert']) + if 'alert' in self._state: + robot_alert = ALERTS.get(self._state['alert']) + else: + robot_alert = None if self._state['state'] == 1: if self._state['details']['isCharging']: self._clean_state = STATE_DOCKED From 990e7c57f28e19a391759b00f2820acbece667ad Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 11 Jan 2019 11:52:07 -0800 Subject: [PATCH 5/6] Fix warning (#19946) * Fix warning * Update service.py --- homeassistant/helpers/service.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py index 66488fbec3d..2b7638b55ee 100644 --- a/homeassistant/helpers/service.py +++ b/homeassistant/helpers/service.py @@ -204,8 +204,9 @@ async def entity_service_call(hass, platforms, func, call): if ATTR_ENTITY_ID in call.data: target_all_entities = call.data[ATTR_ENTITY_ID] == ENTITY_MATCH_ALL else: - _LOGGER.warning('Not passing an entity ID to a service to target all ' - 'entities is deprecated. Use instead: entity_id: "*"') + _LOGGER.warning( + 'Not passing an entity ID to a service to target all entities is ' + 'deprecated. Use instead: entity_id: "%s"', ENTITY_MATCH_ALL) target_all_entities = True if not target_all_entities: From 963ffa1ccc5ad453d0c1ebb066da36495b46f173 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 11 Jan 2019 12:06:12 -0800 Subject: [PATCH 6/6] Bumped version to 0.85.1 --- homeassistant/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/const.py b/homeassistant/const.py index eccbb262ec5..a9ba2211d07 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -2,7 +2,7 @@ """Constants used by Home Assistant components.""" MAJOR_VERSION = 0 MINOR_VERSION = 85 -PATCH_VERSION = '0' +PATCH_VERSION = '1' __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) REQUIRED_PYTHON_VER = (3, 5, 3)