0.7.0 Release.

Author: Adminiuga

.github/release-drafter.yml

@@ -0,0 +1,22 @@
+name-template: '$NEXT_PATCH_VERSION Release.'
+tag-template: '$NEXT_PATCH_VERSION'
+categories:
+  - title: 'Breaking changes'
+    labels:
+      - 'breaking'
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+template: |
+  ## Changes
+
+  $CHANGES

.github/workflows/release-management.yml

@@ -0,0 +1,16 @@
+name: Release Management
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_draft_release:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: toolmantim/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -2,12 +2,14 @@ language: python
 matrix:
   fast_finish: true
   include:
-    - python: "3.5"
+    - python: "3.6"
       env: TOXENV=lint
-    - python: "3.5"
-      env: TOXENV=py35
     - python: "3.6"
       env: TOXENV=py36
+    - python: "3.7"
+      env: TOXENV=py37
+    - python: "3.8"
+      env: TOXENV=py38
 install: pip install -U setuptools tox coveralls
 script: tox
 after_success: coveralls

README.md

@@ -3,4 +3,36 @@
 [![Build Status](https://travis-ci.org/zigpy/zigpy-xbee.svg?branch=master)](https://travis-ci.org/zigpy/zigpy-xbee)
 [![Coverage](https://coveralls.io/repos/github/zigpy/zigpy-xbee/badge.svg?branch=master)](https://coveralls.io/github/zigpy/zigpy-xbee?branch=master)
 
-[zigpy-xbee](https://github.com/zigpy/zigpy-xbee/) is a Python implementation for the [Zigpy](https://github.com/zigpy/) project to implement [XBee](https://en.wikipedia.org/wiki/XBee) based [Zigbee](https://www.zigbee.org) radio devices.
+[zigpy-xbee](https://github.com/zigpy/zigpy-xbee/) is a Python implementation for the [Zigpy](https://github.com/zigpy/) project to implement [XBee](https://en.wikipedia.org/wiki/XBee) based [Zigbee](https://www.zigbee.org) radio devices from Digi.
+
+- https://github.com/zigpy/zigpy-xbee
+
+Digi XBee is the brand name of a family of form factor compatible radio modules from Digi International. 
+
+The XBee radios can all be used with the minimum number of connections — power (3.3 V), ground, data in and data out (UART), with other recommended lines being Reset and Sleep.[5] Additionally, most XBee families have some other flow control, input/output (I/O), analog-to-digital converter (A/D) and indicator lines built in.
+
+- https://en.wikipedia.org/wiki/XBee
+
+Zigbee Home Automation integration with **[zigpy](https://github.com/zigpy/zigpy/)** allows you to connect one of many off-the-shelf Zigbee adapters using one of the available Zigbee radio library modules compatible with zigpy to control Zigbee based devices, including this **[zigpy-xbee](https://github.com/zigpy/zigpy-xbee/)** library for Xbee based Zigbee radio modules. 
+
+[zigpy](https://github.com/zigpy/zigpy/)** currently has support for controlling Zigbee device types such as binary sensors (e.g., motion and door sensors), sensors (e.g., temperature sensors), lightbulbs, switches, and fans. A working implementation of zigbe exist in **[Home Assistant](https://www.home-assistant.io)** (Python based open source home automation software) as part of its **[ZHA component](https://www.home-assistant.io/components/zha/)**
+
+## Compatible hardware
+
+zigpy works with separate radio libraries which can each interface with multiple USB and GPIO radio hardware adapters/modules over different native UART serial protocols. Such radio libraries includes **[zigpy-xbee](https://github.com/zigpy/zigpy-xbee)** (which communicates with XBee based Zigbee radios), **[bellows](https://github.com/zigpy/bellows)** (which communicates with EZSP/EmberZNet based radios), and as **[zigpy-deconz](https://github.com/zigpy/zigpy-deconz)** for deCONZ serial protocol (for communicating with ConBee and RaspBee USB and GPIO radios from Dresden-Elektronik). There are also an experimental radio library called **[zigpy-zigate](https://github.com/doudz/zigpy-zigate)** for communicating with ZiGate based radios.
+
+### Known working XBee based Zigbee radio modules for Zigpy
+
+These are XBee Zigbee based radios that have been tested with the [zigpy-xbee](https://github.com/zigpy/zigpy-xbee) library for zigpy
+
+- Digi XBee Series 2C (S2C) modules
+- Digi XBee Series 2 (S2) modules. Note: These will need to be manually flashed with the Zigbee Coordinator API firmware via XCTU.
+- Digi XBee Series 3 (xbee3-24) modules
+
+# Releases of zigpy-xbee-homeassistant via PyPI
+Tagged versions of zigpy-xbee-homeassistant are also released via PyPI
+
+- https://pypi.org/project/zigpy-xbee-homeassistant/
+- https://pypi.org/project/zigpy-xbee-homeassistant/#history
+- https://pypi.org/project/zigpy-xbee-homeassistant/#files
+

setup.cfg

@@ -26,6 +26,6 @@ not_skip = __init__.py
 force_sort_within_sections = true
 sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 default_section = THIRDPARTY
-known_first_party = homeassistant,tests
+known_first_party = zigpy_xbee,tests
 forced_separate = tests
 combine_as_imports = true

tests/test_application.py

@@ -547,3 +547,40 @@ def test_rx_device_annce(app, ieee, nwk):
     assert app.handle_join.call_args[0][0] == nwk
     assert app.handle_join.call_args[0][1] == ieee
     assert app.handle_join.call_args[0][2] == 0
+
+
+async def _test_mrequest(app, send_success=True, send_timeout=False, **kwargs):
+    seq = 123
+    group_id = 0x2345
+
+    def _mock_command(
+        cmdname, ieee, nwk, src_ep, dst_ep, cluster, profile, radius, options, data
+    ):
+        send_fut = asyncio.Future()
+        if not send_timeout:
+            if send_success:
+                send_fut.set_result(xbee_t.TXStatus.SUCCESS)
+            else:
+                send_fut.set_result(xbee_t.TXStatus.ADDRESS_NOT_FOUND)
+        return send_fut
+
+    app._api._command = mock.MagicMock(side_effect=_mock_command)
+    return await app.mrequest(group_id, 0x0260, 1, 2, seq, b"\xaa\x55\xbe\xef")
+
+
+@pytest.mark.asyncio
+async def test_mrequest_with_reply(app):
+    r = await _test_mrequest(app, send_success=True)
+    assert r[0] == 0
+
+
+@pytest.mark.asyncio
+async def test_mrequest_send_timeout(app):
+    r = await _test_mrequest(app, send_timeout=True)
+    assert r[0] != 0
+
+
+@pytest.mark.asyncio
+async def test_mrequest_send_fail(app):
+    r = await _test_mrequest(app, send_success=False)
+    assert r[0] != 0

tests/test_uart.py

@@ -67,17 +67,17 @@ def test_close(gw):
 
 
 def test_data_received_chunk_frame(gw):
-    data = b"~\x00\x07\x8b\x0e\xff\xfd\x00$\x02D"
+    data = b"~\x00\r\x88\rID\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd"
     gw.frame_received = mock.MagicMock()
-    gw.data_received(data[:-4])
+    gw.data_received(data[:3])
     assert gw.frame_received.call_count == 0
-    gw.data_received(data[-4:])
+    gw.data_received(data[3:])
     assert gw.frame_received.call_count == 1
     assert gw.frame_received.call_args[0][0] == data[3:-1]
 
 
 def test_data_received_full_frame(gw):
-    data = b"~\x00\x07\x8b\x0e\xff\xfd\x00$\x02D"
+    data = b"~\x00\r\x88\rID\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd"
     gw.frame_received = mock.MagicMock()
     gw.data_received(data)
     assert gw.frame_received.call_count == 1
@@ -91,15 +91,29 @@ def test_data_received_incomplete_frame(gw):
     assert gw.frame_received.call_count == 0
 
 
-def test_data_received_at_response(gw):
+def test_data_received_at_response_non_cmd_mode(gw):
     data = b"OK\x0D"
     gw.frame_received = mock.MagicMock()
     gw.command_mode_rsp = mock.MagicMock()
 
+    gw.data_received(data)
+    assert gw.command_mode_rsp.call_count == 0
+
+
+def test_data_received_at_response_in_cmd_mode(gw):
+    data = b"OK\x0D"
+    gw.frame_received = mock.MagicMock()
+    gw.command_mode_rsp = mock.MagicMock()
+
+    gw.command_mode_send(b"")
     gw.data_received(data)
     assert gw.command_mode_rsp.call_count == 1
     assert gw.command_mode_rsp.call_args[0][0] == b"OK"
 
+    gw.reset_command_mode()
+    gw.data_received(data)
+    assert gw.command_mode_rsp.call_count == 1
+
 
 def test_extract(gw):
     gw._buffer = b"\x7E\x00\x02\x23\x7D\x31\xCBextra"

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py35, py36, lint
+envlist = py36, py37, py38, lint, black
 skip_missing_interpreters = True
 
 [testenv]
@@ -22,3 +22,10 @@ basepython = python3
 deps = flake8
 commands = flake8
 
+[testenv:black]
+deps=black
+setenv =
+    LC_ALL=C.UTF-8
+    LANG=C.UTF-8
+commands=
+    black --check --fast {toxinidir}/zigpy_xbee {toxinidir}/tests {toxinidir}/setup.py

zigpy_xbee/__init__.py

@@ -1,5 +1,5 @@
 MAJOR_VERSION = 0
-MINOR_VERSION = 6
+MINOR_VERSION = 7
 PATCH_VERSION = "0"
 __short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = "{}.{}".format(__short_version__, PATCH_VERSION)

zigpy_xbee/api.py

@@ -320,7 +320,7 @@ def frame_received(self, data):
             LOGGER.error("No '%s' handler. Data: %s", command, binascii.hexlify(data))
 
     def _handle_at_response(self, frame_id, cmd, status, value):
-        fut, = self._awaiting.pop(frame_id)
+        (fut,) = self._awaiting.pop(frame_id)
         try:
             status = ATCommandResult(status)
         except ValueError:
@@ -391,7 +391,7 @@ def _handle_tx_status(self, frame_id, nwk, tries, tx_status, dsc_status):
             frame_id,
         )
         try:
-            fut, = self._awaiting.pop(frame_id)
+            (fut,) = self._awaiting.pop(frame_id)
         except KeyError:
             LOGGER.debug("unexpected tx_status report received")
             return
@@ -449,11 +449,11 @@ async def api_mode_at_commands(self, baudrate):
             cmds.insert(0, bd)
 
         for cmd in cmds:
-            if await self.command_mode_at_cmd(cmd + "\r"):
-                LOGGER.debug("Successfuly sent %s cmd", cmd)
-            else:
+            if not await self.command_mode_at_cmd(cmd + "\r"):
                 LOGGER.debug("No response to %s cmd", cmd)
                 return None
+            LOGGER.debug("Successfuly sent %s cmd", cmd)
+        self._uart.reset_command_mode()
         return True
 
     async def init_api_mode(self):