Skip to content

0.12.1 Release #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Update tests
merged 6 commits into from
Aug 5, 2021
Merged

0.12.1 Release #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
709a152
0.13.0.dev0 version bump
Adminiuga Mar 23, 2021
5f85872
Bump up codecov version
Adminiuga Apr 21, 2021
3e6a036
Fix startup error due to `None` node descriptor (#161)
puddly Aug 5, 2021
11da113
Push to pypi on Release
Adminiuga Aug 5, 2021
17ef3e1
0.12.1 Version bump
Adminiuga Aug 5, 2021
2701092
Merge branch 'master' into rc
Adminiuga Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ jobs:
coverage report --fail-under=97
coverage xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1.0.14
uses: codecov/codecov-action@v1
- name: Upload coverage to Coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-to-pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Publish distributions to PyPI and TestPyPI
on:
push:
tags:
- "*"
release:
types:
- released

jobs:
build-and-publish:
Expand Down
5 changes: 2 additions & 3 deletions tests/test_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,9 @@ async def test_restore_neighbours(app):
device_2.nwk = 0x2222
nei_2 = zigpy.neighbor.Neighbor(sentinel.nei_2, device_2)

# invalid node descriptor
desc_3 = zdo_t.NodeDescriptor()
# Missing node descriptor
device_3 = MagicMock()
device_3.node_desc = desc_3
device_3.node_desc = None
device_3.ieee = sentinel.ieee_3
device_3.nwk = 0x3333
nei_3 = zigpy.neighbor.Neighbor(sentinel.nei_3, device_3)
Expand Down
2 changes: 1 addition & 1 deletion zigpy_deconz/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# coding: utf-8
MAJOR_VERSION = 0
MINOR_VERSION = 12
PATCH_VERSION = "0"
PATCH_VERSION = "1"
__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
__version__ = f"{__short_version__}.{PATCH_VERSION}"
14 changes: 8 additions & 6 deletions zigpy_deconz/zigbee/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,18 +345,20 @@ async def restore_neighbours(self) -> None:
for device in devices:
if device is None:
continue
descr = device.node_desc
LOGGER.debug(
"device: 0x%04x - %s %s, FFD=%s, Rx_on_when_idle=%s",
device.nwk,
device.manufacturer,
device.model,
device.node_desc.is_full_function_device,
device.node_desc.is_receiver_on_when_idle,
descr.is_full_function_device if descr is not None else None,
descr.is_receiver_on_when_idle if descr is not None else None,
)
descr = device.node_desc
if not descr.is_valid:
continue
if descr.is_full_function_device or descr.is_receiver_on_when_idle:
if (
descr is None
or descr.is_full_function_device
or descr.is_receiver_on_when_idle
):
continue
LOGGER.debug(
"Restoring %s/0x%04x device as direct child",
Expand Down