0.25.0 Release

zigpy · Jun 12, 2021 · f8e8b58 · f8e8b58
2 parents a834079 + 011f402
commit f8e8b58
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,6 +35,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
           restore-keys: |
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-
@@ -67,6 +68,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -108,6 +110,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -151,6 +154,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -197,6 +201,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -240,6 +245,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -290,6 +296,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -352,6 +359,7 @@ jobs:
           key: >-
             ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
             steps.python.outputs.python-version }}-${{
+            hashFiles('setup.py') }}-${{
             hashFiles('requirements_test.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'

diff --git a/bellows/__init__.py b/bellows/__init__.py
@@ -1,5 +1,5 @@
 MAJOR_VERSION = 0
-MINOR_VERSION = 24
+MINOR_VERSION = 25
 PATCH_VERSION = "0"
 __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__ = f"{__short_version__}.{PATCH_VERSION}"
diff --git a/bellows/zigbee/application.py b/bellows/zigbee/application.py
@@ -463,9 +463,8 @@ async def request(
                             )
 
                     async with self._req_lock:
-                        if expect_reply and device.node_desc.is_end_device in (
-                            True,
-                            None,
+                        if expect_reply and (
+                            device.node_desc is None or device.node_desc.is_end_device
                         ):
                             LOGGER.debug(
                                 "Extending timeout for %s/0x%04x",

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
         "pure_pcapy3==1.0.1",
         "pyserial-asyncio",
         "voluptuous",
-        "zigpy>=0.21.0",
+        "zigpy>=0.34.0",
     ],
     dependency_links=["https://codeload.github.com/rcloran/pure-pcapy-3/zip/master"],
     tests_require=["asynctest", "pytest", "pytest-asyncio"],

diff --git a/tests/test_application.py b/tests/test_application.py
@@ -5,6 +5,7 @@
 import zigpy.config
 from zigpy.device import Device
 from zigpy.zcl.clusters import security
+import zigpy.zdo.types as zdo_t
 
 import bellows.config as config
 from bellows.exception import ControllerError, EzspError
@@ -408,7 +409,16 @@ async def mocksend(method, nwk, aps_frame, seq, data):
     app._ezsp.setExtendedTimeout = AsyncMock()
     device = MagicMock()
     device.relays = relays
-    device.node_desc.is_end_device = is_end_device
+
+    if is_end_device is not None:
+        device.node_desc = zdo_t.NodeDescriptor(
+            logical_type=(
+                zdo_t.LogicalType.EndDevice
+                if is_end_device
+                else zdo_t.LogicalType.Router
+            )
+        )
+
     res = await app.request(device, 9, 8, 7, 6, 5, b"", **kwargs)
     assert len(app._pending) == 0
     return res