From d22bb8fc7da01920c6c28e6ef64ddd04946269b1 Mon Sep 17 00:00:00 2001
From: "David F. Mulcahey" <david.mulcahey@me.com>
Date: Sun, 23 Jun 2019 13:43:19 -0400
Subject: [PATCH] Update ZHA dependencies (#24718)

* update deps and remove legacy constants bridge

* run deps script and fix test import
---
 homeassistant/components/zha/const.py         | 4 ----
 homeassistant/components/zha/device_entity.py | 2 +-
 homeassistant/components/zha/light.py         | 2 +-
 homeassistant/components/zha/manifest.json    | 4 ++--
 requirements_all.txt                          | 4 ++--
 requirements_test_all.txt                     | 2 +-
 tests/components/zha/test_config_flow.py      | 2 +-
 7 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 homeassistant/components/zha/const.py

diff --git a/homeassistant/components/zha/const.py b/homeassistant/components/zha/const.py
deleted file mode 100644
index 1ccc3e0ea25..00000000000
--- a/homeassistant/components/zha/const.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""Backwards compatible constants bridge."""
-# pylint: disable=W0614,W0401
-from .core.const import *  # noqa: F401,F403
-from .core.registries import *  # noqa: F401,F403
diff --git a/homeassistant/components/zha/device_entity.py b/homeassistant/components/zha/device_entity.py
index b3cb19f2c5a..c61c0347704 100644
--- a/homeassistant/components/zha/device_entity.py
+++ b/homeassistant/components/zha/device_entity.py
@@ -7,7 +7,7 @@ import time
 from homeassistant.core import callback
 from homeassistant.util import slugify
 from .entity import ZhaEntity
-from .const import POWER_CONFIGURATION_CHANNEL, SIGNAL_STATE_ATTR
+from .core.const import POWER_CONFIGURATION_CHANNEL, SIGNAL_STATE_ATTR
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/zha/light.py b/homeassistant/components/zha/light.py
index 64c515b06b0..9e0f2739290 100644
--- a/homeassistant/components/zha/light.py
+++ b/homeassistant/components/zha/light.py
@@ -9,7 +9,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.event import async_track_time_interval
 import homeassistant.util.color as color_util
-from .const import (
+from .core.const import (
     DATA_ZHA, DATA_ZHA_DISPATCHERS, ZHA_DISCOVERY_NEW, COLOR_CHANNEL,
     ON_OFF_CHANNEL, LEVEL_CHANNEL, SIGNAL_ATTR_UPDATED, SIGNAL_SET_LEVEL
     )
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 9734b10fab2..e8f417b8eb0 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -5,9 +5,9 @@
   "documentation": "https://www.home-assistant.io/components/zha",
   "requirements": [
     "bellows-homeassistant==0.8.1",
-    "zha-quirks==0.0.14",
+    "zha-quirks==0.0.15",
     "zigpy-deconz==0.1.6",
-    "zigpy-homeassistant==0.5.0",
+    "zigpy-homeassistant==0.6.1",
     "zigpy-xbee-homeassistant==0.3.0"
   ],
   "dependencies": [],
diff --git a/requirements_all.txt b/requirements_all.txt
index 180f1ec2edb..f428619691f 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1921,7 +1921,7 @@ zengge==0.2
 zeroconf==0.23.0
 
 # homeassistant.components.zha
-zha-quirks==0.0.14
+zha-quirks==0.0.15
 
 # homeassistant.components.zhong_hong
 zhong_hong_hvac==1.0.9
@@ -1933,7 +1933,7 @@ ziggo-mediabox-xl==1.1.0
 zigpy-deconz==0.1.6
 
 # homeassistant.components.zha
-zigpy-homeassistant==0.5.0
+zigpy-homeassistant==0.6.1
 
 # homeassistant.components.zha
 zigpy-xbee-homeassistant==0.3.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 5b435cce241..b5a48acf3d2 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -371,4 +371,4 @@ wakeonlan==1.1.6
 zeroconf==0.23.0
 
 # homeassistant.components.zha
-zigpy-homeassistant==0.5.0
+zigpy-homeassistant==0.6.1
diff --git a/tests/components/zha/test_config_flow.py b/tests/components/zha/test_config_flow.py
index e46f1849fa1..a05de08f804 100644
--- a/tests/components/zha/test_config_flow.py
+++ b/tests/components/zha/test_config_flow.py
@@ -1,7 +1,7 @@
 """Tests for ZHA config flow."""
 from asynctest import patch
 from homeassistant.components.zha import config_flow
-from homeassistant.components.zha.const import DOMAIN
+from homeassistant.components.zha.core.const import DOMAIN
 from tests.common import MockConfigEntry