Make zigpy-xbee compatible with zigpy==0.23.0 (#108)

* Make zigpy-xbee compatible with zigpy==0.23.0

* Pin flake/isort versions

* Drop py36

Author: Adminiuga

.travis.yml

@@ -2,12 +2,10 @@ language: python
 matrix:
   fast_finish: true
   include:
-    - python: "3.6"
+    - python: "3.7"
       env: TOXENV=lint
-    - python: "3.6"
+    - python: "3.7"
       env: TOXENV=black
-    - python: "3.6"
-      env: TOXENV=py36
     - python: "3.7"
       env: TOXENV=py37
     - python: "3.8"

setup.py

@@ -21,6 +21,6 @@
     author_email="[email protected]",
     license="GPL-3.0",
     packages=find_packages(exclude=["*.tests"]),
-    install_requires=["pyserial-asyncio", "zigpy>= 0.20.a1"],
+    install_requires=["pyserial-asyncio", "zigpy>= 0.23.0"],
     tests_require=["pytest"],
 )

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py36, py37, py38, lint, black
+envlist = py37, py38, lint, black
 skip_missing_interpreters = True
 
 [testenv]
@@ -21,8 +21,8 @@ deps =
 [testenv:lint]
 basepython = python3
 deps =
-    flake8
-    isort
+    flake8==3.7.9
+    isort==4.3.21
 commands =
     flake8
     isort --check -rc {toxinidir}/zigpy_xbee {toxinidir}/tests {toxinidir}/setup.py

zigpy_xbee/api.py

@@ -7,7 +7,6 @@
 
 import serial
 from zigpy.exceptions import APIException, DeliveryError
-from zigpy.types import LVList
 
 import zigpy_xbee
 from zigpy_xbee.config import CONF_DEVICE_BAUDRATE, CONF_DEVICE_PATH, SCHEMA_DEVICE
@@ -68,7 +67,7 @@ class ModemStatus(t.uint8_t, t.UndefinedEnum):
     ),
     "create_source_route": (
         0x21,
-        (t.FrameId, t.EUI64, t.NWK, t.uint8_t, LVList(t.NWK)),
+        (t.FrameId, t.EUI64, t.NWK, t.uint8_t, t.Relays),
         None,
     ),
     "register_joining_device": (0x24, (), None),
@@ -104,7 +103,7 @@ class ModemStatus(t.uint8_t, t.UndefinedEnum):
         None,
     ),
     "extended_status": (0x98, (), None),
-    "route_record_indicator": (0xA1, (t.EUI64, t.NWK, t.uint8_t, LVList(t.NWK)), None),
+    "route_record_indicator": (0xA1, (t.EUI64, t.NWK, t.uint8_t, t.Relays), None),
     "many_to_one_rri": (0xA3, (t.EUI64, t.NWK, t.uint8_t), None),
     "node_id_indicator": (0x95, (), None),
 }

zigpy_xbee/types.py

@@ -161,6 +161,10 @@ def __str__(self):
         return "0x{:04x}".format(self)
 
 
+class Relays(zigpy.types.LVList, item_type=NWK, length_type=uint8_t):
+    """List of Relays."""
+
+
 UNKNOWN_IEEE = EUI64([uint8_t(0xFF) for i in range(0, 8)])
 UNKNOWN_NWK = NWK(0xFFFE)