Fix ci

.github/workflows/ci.yml

@@ -0,0 +1,16 @@
+name: CI
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+  pull_request: ~
+
+jobs:
+  shared-ci:
+    uses: zigpy/workflows/.github/workflows/ci.yml@main
+    with:
+      CODE_FOLDER: zigpy_xbee
+      CACHE_VERSION: 2
+      PYTHON_VERSION_DEFAULT: 3.9.15
+      PRE_COMMIT_CACHE_PATH:  ~/.cache/pre-commit
+      MINIMUM_COVERAGE_PERCENTAGE: 99

.github/workflows/matchers/codespell.json

@@ -0,0 +1,16 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "codespell",
+      "severity": "warning",
+      "pattern": [
+        {
+          "regexp": "^(.+):(\\d+):\\s(.+)$",
+          "file": 1,
+          "line": 2,
+          "message": 3
+        }
+      ]
+    }
+  ]
+}

.github/workflows/matchers/flake8.json

@@ -0,0 +1,30 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "flake8-error",
+      "severity": "error",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s([EF]\\d{3}\\s.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4
+        }
+      ]
+    },
+    {
+      "owner": "flake8-warning",
+      "severity": "warning",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s([CDNW]\\d{3}\\s.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4
+        }
+      ]
+    }
+  ]
+}

.github/workflows/matchers/python.json

@@ -0,0 +1,18 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "python",
+      "pattern": [
+        {
+          "regexp": "^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$",
+          "file": 1,
+          "line": 2
+        },
+        {
+          "regexp": "^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$",
+          "message": 2
+        }
+      ]
+    }
+  ]
+}

.github/workflows/publish-to-pypi.yml

@@ -1,26 +1,11 @@
-name: Publish distributions to PyPI and TestPyPI
+name: Publish distributions to PyPI
 on:
-  push:
-    tags:
-      - "*"
+  release:
+    types:
+      - published
 
 jobs:
-  build-and-publish:
-    name: Build and publish distributions to PyPI and TestPyPI
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
-      with:
-        version: 3.8
-    - name: Install wheel
-      run: >-
-        pip install wheel
-    - name: Build
-      run: >-
-        python3 setup.py sdist bdist_wheel
-    - name: Publish distribution to PyPI
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        password: ${{ secrets.PYPI_TOKEN }}
+  shared-build-and-publish:
+    uses: zigpy/workflows/.github/workflows/publish-to-pypi.yml@main
+    secrets:
+      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

.gitignore

@@ -68,6 +68,7 @@ ENV/
 
 # Editor temp files
 .*.swp
+tags
 
 # Visual Studio Code
-.vscode
+.vscode

.pre-commit-config.yaml

@@ -10,6 +10,8 @@ repos:
     rev: 6.0.0
     hooks:
       - id: flake8
+        additional_dependencies:
+          - Flake8-pyproject==1.2.3
   - repo: https://github.com/PyCQA/isort
     rev: 5.12.0
     hooks:

pyproject.toml

@@ -0,0 +1,54 @@
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel", "setuptools-git-versioning<2"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "zigpy-xbee"
+dynamic = ["version"]
+description = "A library which communicates with XBee radios for zigpy"
+urls = {repository = "https://github.com/zigpy/zigpy-xbee"}
+authors = [
+    {name = "Russell Cloran", email = "rcloran@gmail.com"}
+]
+readme = "README.md"
+license = {text = "GPL-3.0"}
+requires-python = ">=3.8"
+dependencies = [
+    "zigpy>=0.56.0",
+]
+
+[tool.setuptools.packages.find]
+exclude = ["tests", "tests.*"]
+
+[project.optional-dependencies]
+testing = [
+    "pytest>=7.1.2",
+    "asynctest>=0.13.0",
+    "pytest-asyncio>=0.19.0",
+]
+
+[tool.setuptools-git-versioning]
+enabled = true
+
+[tool.isort]
+profile = "black"
+# will group `import x` and `from x import` of the same module.
+force_sort_within_sections = true
+known_first_party = ["zigpy_xbee", "tests"]
+forced_separate = "tests"
+combine_as_imports = true
+
+[tool.mypy]
+ignore_errors = true
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+
+[tool.flake8]
+exclude = [".venv", ".git", ".tox", "docs", "venv", "bin", "lib", "deps", "build"]
+# To work with Black
+max-line-length = 88
+# W503: Line break occurred before a binary operator
+# E203: Whitespace before ':'
+# D202 No blank lines allowed after function docstring
+ignore = ["W503", "E203", "D202"]

requirements_test.txt

@@ -0,0 +1,20 @@
+# Test dependencies.
+
+asynctest
+isort
+black
+flake8
+codecov
+colorlog
+codespell
+mypy==1.2.0
+pre-commit
+pylint
+pytest-cov
+pytest-sugar
+pytest-timeout
+pytest-asyncio>=0.17
+pytest>=7.1.3
+zigpy>=0.54.1
+ruff==0.0.261
+Flake8-pyproject

setup.py

@@ -1,22 +1,6 @@
-"""Setup module for zigpy-xbee"""
+"""Setup stub for legacy builds."""
 
-import pathlib
+import setuptools
 
-from setuptools import find_packages, setup
-
-import zigpy_xbee
-
-setup(
-    name="zigpy-xbee",
-    version=zigpy_xbee.__version__,
-    description="A library which communicates with XBee radios for zigpy",
-    long_description=(pathlib.Path(__file__).parent / "README.md").read_text(),
-    long_description_content_type="text/markdown",
-    url="http://github.com/zigpy/zigpy-xbee",
-    author="Russell Cloran",
-    author_email="rcloran@gmail.com",
-    license="GPL-3.0",
-    packages=find_packages(exclude=["tests", "tests.*"]),
-    install_requires=["zigpy>=0.56.0"],
-    tests_require=["pytest", "asynctest", "pytest-asyncio"],
-)
+if __name__ == "__main__":
+    setuptools.setup()

tests/test_application.py

@@ -478,9 +478,11 @@ async def test_force_remove(app):
 
 
 async def test_shutdown(app):
-    app._api.close = mock.MagicMock()
+    mack_close = mock.MagicMock()
+    app._api.close = mack_close
     await app.shutdown()
-    assert app._api.close.call_count == 1
+    assert app._api is None
+    assert mack_close.call_count == 1
 
 
 def test_remote_at_cmd(app, device):

tests/test_uart.py

@@ -54,8 +54,7 @@ def test_command_mode_rsp(gw):
 def test_command_mode_send(gw):
     data = b"ATAP2\x0D"
     gw.command_mode_send(data)
-    assert gw._transport.write.call_count == 1
-    assert gw._transport.write.called_once_with(data)
+    gw._transport.write.assert_called_once_with(data)
 
 
 def test_close(gw):
@@ -160,9 +159,8 @@ def test_frame_received(gw):
 
 def test_send(gw):
     gw.send(b"\x23\x11")
-    assert gw._transport.write.call_count == 1
     data = b"\x7E\x00\x02\x23\x7D\x31\xCB"
-    assert gw._transport.write.called_once_with(data)
+    gw._transport.write.assert_called_once_with(data)
 
 
 def test_escape(gw):

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py37, py38, lint, black
+envlist = py38, py39, py310, py311, py312, lint, black
 skip_missing_interpreters = True
 
 [testenv]
@@ -13,19 +13,19 @@ install_command = pip install {opts} {packages}
 commands = py.test --cov --cov-report=
 deps =
     asynctest
-    coveralls
     pytest
     pytest-cov
     pytest-asyncio
 
 [testenv:lint]
 basepython = python3
 deps =
-    flake8==3.7.9
-    isort==4.3.21
+    flake8==6.1.0
+    isort==5.12.0
+    Flake8-pyproject==1.2.3
 commands =
     flake8
-    isort --check -rc {toxinidir}/zigpy_xbee {toxinidir}/tests {toxinidir}/setup.py
+    isort --check {toxinidir}/zigpy_xbee {toxinidir}/tests {toxinidir}/setup.py
 
 [testenv:black]
 deps=black