From cd0195a27ac9b9e4934e0317c1b270fcdb59b97a Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Sun, 6 Sep 2020 23:10:15 -0400
Subject: [PATCH] Update ZHA dependencies (#39700)

* Update ZHA dependencies
* Update zigpy-zigate
* Move ZNP on top of the radios so it's probed 1st

Some stick don't like if there was some unexpected traffic on the port
prior the initialization.

* Update dependencies
---
 homeassistant/components/zha/core/const.py |  7 ++++++-
 homeassistant/components/zha/manifest.json | 13 +++++++------
 requirements_all.txt                       | 15 +++++++++------
 requirements_test_all.txt                  | 15 +++++++++------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/homeassistant/components/zha/core/const.py b/homeassistant/components/zha/core/const.py
index 63652f58f30..402c1505415 100644
--- a/homeassistant/components/zha/core/const.py
+++ b/homeassistant/components/zha/core/const.py
@@ -9,6 +9,7 @@ import zigpy_cc.zigbee.application
 import zigpy_deconz.zigbee.application
 import zigpy_xbee.zigbee.application
 import zigpy_zigate.zigbee.application
+import zigpy_znp.zigbee.application
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR
 from homeassistant.components.climate import DOMAIN as CLIMATE
@@ -169,6 +170,10 @@ POWER_BATTERY_OR_UNKNOWN = "Battery or Unknown"
 class RadioType(enum.Enum):
     """Possible options for radio type."""
 
+    znp = (
+        "ZNP = Texas Instruments Z-Stack ZNP protocol: CC253x, CC26x2, CC13x2",
+        zigpy_znp.zigbee.application.ControllerApplication,
+    )
     ezsp = (
         "EZSP = Silicon Labs EmberZNet protocol: Elelabs, HUSBZB-1, Telegesis",
         bellows.zigbee.application.ControllerApplication,
@@ -178,7 +183,7 @@ class RadioType(enum.Enum):
         zigpy_deconz.zigbee.application.ControllerApplication,
     )
     ti_cc = (
-        "TI_CC = Texas Instruments Z-Stack ZNP protocol: CC253x, CC26x2, CC13x2",
+        "Legacy TI_CC = Texas Instruments Z-Stack ZNP protocol: CC253x, CC26x2, CC13x2",
         zigpy_cc.zigbee.application.ControllerApplication,
     )
     zigate = (
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index bb5da313a56..1fd8bb71920 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -4,14 +4,15 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zha",
   "requirements": [
-    "bellows==0.18.1",
+    "bellows==0.20.1",
     "pyserial==3.4",
-    "zha-quirks==0.0.43",
-    "zigpy-cc==0.5.1",
+    "zha-quirks==0.0.44",
+    "zigpy-cc==0.5.2",
     "zigpy-deconz==0.9.2",
-    "zigpy==0.22.2",
-    "zigpy-xbee==0.12.1",
-    "zigpy-zigate==0.6.1"
+    "zigpy==0.23.1",
+    "zigpy-xbee==0.13.0",
+    "zigpy-zigate==0.6.2",
+    "zigpy-znp==0.1.1"
   ],
   "codeowners": ["@dmulcahey", "@adminiuga"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index f8c452c2de4..31cb792e01a 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -339,7 +339,7 @@ beautifulsoup4==4.9.1
 # beewi_smartclim==0.0.7
 
 # homeassistant.components.zha
-bellows==0.18.1
+bellows==0.20.1
 
 # homeassistant.components.bmw_connected_drive
 bimmer_connected==0.7.7
@@ -2286,7 +2286,7 @@ zengge==0.2
 zeroconf==0.28.4
 
 # homeassistant.components.zha
-zha-quirks==0.0.43
+zha-quirks==0.0.44
 
 # homeassistant.components.zhong_hong
 zhong_hong_hvac==1.0.9
@@ -2295,19 +2295,22 @@ zhong_hong_hvac==1.0.9
 ziggo-mediabox-xl==1.1.0
 
 # homeassistant.components.zha
-zigpy-cc==0.5.1
+zigpy-cc==0.5.2
 
 # homeassistant.components.zha
 zigpy-deconz==0.9.2
 
 # homeassistant.components.zha
-zigpy-xbee==0.12.1
+zigpy-xbee==0.13.0
 
 # homeassistant.components.zha
-zigpy-zigate==0.6.1
+zigpy-zigate==0.6.2
 
 # homeassistant.components.zha
-zigpy==0.22.2
+zigpy-znp==0.1.1
+
+# homeassistant.components.zha
+zigpy==0.23.1
 
 # homeassistant.components.zoneminder
 zm-py==0.4.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 1b41e369779..a403117580a 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -183,7 +183,7 @@ azure-eventhub==5.1.0
 base36==0.1.1
 
 # homeassistant.components.zha
-bellows==0.18.1
+bellows==0.20.1
 
 # homeassistant.components.blebox
 blebox_uniapi==1.3.2
@@ -1056,19 +1056,22 @@ yeelight==0.5.3
 zeroconf==0.28.4
 
 # homeassistant.components.zha
-zha-quirks==0.0.43
+zha-quirks==0.0.44
 
 # homeassistant.components.zha
-zigpy-cc==0.5.1
+zigpy-cc==0.5.2
 
 # homeassistant.components.zha
 zigpy-deconz==0.9.2
 
 # homeassistant.components.zha
-zigpy-xbee==0.12.1
+zigpy-xbee==0.13.0
 
 # homeassistant.components.zha
-zigpy-zigate==0.6.1
+zigpy-zigate==0.6.2
 
 # homeassistant.components.zha
-zigpy==0.22.2
+zigpy-znp==0.1.1
+
+# homeassistant.components.zha
+zigpy==0.23.1