Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zigpy/zigpy-deconz
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.14.0
Choose a base ref
...
head repository: zigpy/zigpy-deconz
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Nov 27, 2021

  1. Implement new core methods

    puddly committed Nov 27, 2021
    Copy the full SHA
    d972531 View commit details
  2. Copy the full SHA
    2effc40 View commit details
  3. Copy the full SHA
    3fe31b3 View commit details
  4. Copy the full SHA
    713690d View commit details
  5. Copy the full SHA
    f81a6fa View commit details
  6. Copy the full SHA
    ed90a0e View commit details
  7. Copy the full SHA
    3a18479 View commit details

Commits on Nov 28, 2021

  1. 0.15.0.dev0 version bump

    Adminiuga authored Nov 28, 2021
    Copy the full SHA
    b3aac2e View commit details

Commits on Dec 9, 2021

  1. Add support for tcp forwarded serial ports (#176)

    * Add support for tcp forwarded serial ports
    
    * Format code
    youduda authored Dec 9, 2021
    Copy the full SHA
    22f07a4 View commit details

Commits on Dec 12, 2021

  1. Copy the full SHA
    ba4ea80 View commit details

Commits on Dec 16, 2021

  1. Correctly read link key

    puddly committed Dec 16, 2021
    Copy the full SHA
    4f52658 View commit details
  2. Copy the full SHA
    c408d38 View commit details
  3. Copy the full SHA
    dc0cd97 View commit details

Commits on Dec 26, 2021

  1. Copy the full SHA
    cf5cc8c View commit details

Commits on Jan 10, 2022

  1. Copy the full SHA
    6560731 View commit details

Commits on Mar 6, 2022

  1. Use manual source routes when retrying and enable APS ACKs (#182)

    * Add support for manual source routes
    
    * Untested implementation
    
    * Fix existing unit tests
    
    * Runtime test the code
    
    * Force requests to send when a route is unknown
    
    * Add unit tests
    
    * Use APS ACKs by default
    puddly authored Mar 6, 2022
    Copy the full SHA
    a8412d3 View commit details

Commits on Mar 11, 2022

  1. Copy the full SHA
    eb37a24 View commit details
  2. Copy the full SHA
    180a810 View commit details
  3. Merge pull request #184 from zigbeefordomoticz/patch-1

    Align config with other Zigpy radio libs
    puddly authored Mar 11, 2022
    Copy the full SHA
    29e914e View commit details
  4. Copy the full SHA
    0c7e42c View commit details
  5. Fix isort

    puddly committed Mar 11, 2022
    Copy the full SHA
    87154e6 View commit details
  6. Copy the full SHA
    ff94f15 View commit details

Commits on Mar 12, 2022

  1. Add unit tests

    puddly committed Mar 12, 2022
    Copy the full SHA
    a13fe90 View commit details
  2. Copy the full SHA
    2d0ac93 View commit details

Commits on Mar 13, 2022

  1. Copy the full SHA
    4b355d3 View commit details

Commits on Mar 15, 2022

  1. Copy the full SHA
    9ac00de View commit details

Commits on Mar 23, 2022

  1. Copy the full SHA
    4b95110 View commit details

Commits on Mar 28, 2022

  1. Copy the full SHA
    89f2d1a View commit details

Commits on Apr 1, 2022

  1. Copy the full SHA
    2b78625 View commit details
  2. Re-run isort

    puddly committed Apr 1, 2022
    Copy the full SHA
    993387b View commit details
  3. Merge pull request #189 from puddly/puddly/fix-black

    Upgrade Black in pre-commit to fix Click dep issue
    puddly authored Apr 1, 2022
    Copy the full SHA
    96007e4 View commit details
  4. Revert "Add support for tcp forwarded serial ports (#176)"

    This reverts commit 22f07a4.
    puddly committed Apr 1, 2022
    Copy the full SHA
    87d56cd View commit details
  5. Merge pull request #190 from puddly/revert-tcp-serial-ports

    Revert "Add support for tcp forwarded serial ports (#176)"
    puddly authored Apr 1, 2022
    Copy the full SHA
    30a9819 View commit details
  6. Merge branch 'dev' into rc

    puddly committed Apr 1, 2022
    Copy the full SHA
    995515d View commit details
  7. Bump version to 0.15.0

    puddly committed Apr 1, 2022
    Copy the full SHA
    39e04c1 View commit details
  8. Merge pull request #191 from puddly/rc

    0.15.0 Release
    puddly authored Apr 1, 2022
    Copy the full SHA
    c221599 View commit details
  9. 0.16.0.dev0 version bump

    puddly committed Apr 1, 2022
    Copy the full SHA
    5fa4e2b View commit details

Commits on Apr 12, 2022

  1. Copy the full SHA
    c655b87 View commit details
  2. Copy the full SHA
    5dfe719 View commit details
  3. Copy the full SHA
    ea1e642 View commit details

Commits on Apr 17, 2022

  1. Copy the full SHA
    36af4a8 View commit details
  2. Merge pull request #193 from puddly/puddly/request-concurrency

    Implement request concurrency limits
    puddly authored Apr 17, 2022
    Copy the full SHA
    9f21510 View commit details

Commits on Apr 18, 2022

  1. Copy the full SHA
    46c1c2f View commit details

Commits on Apr 19, 2022

  1. Implement add_endpoint

    puddly committed Apr 19, 2022
    Copy the full SHA
    99df53f View commit details

Commits on Apr 20, 2022

  1. Copy the full SHA
    030edfc View commit details

Commits on Apr 22, 2022

  1. Copy the full SHA
    6f7253d View commit details

Commits on Apr 26, 2022

  1. Merge branch 'dev' into rc

    puddly committed Apr 26, 2022
    Copy the full SHA
    ad84aa4 View commit details
  2. 0.16.0 Release

    puddly committed Apr 26, 2022
    Copy the full SHA
    b2e5acb View commit details
  3. 0.16.0 Release

    0.16.0 Release
    puddly authored Apr 26, 2022
    Copy the full SHA
    1c500c2 View commit details
  4. 0.17.0.dev0 version bump

    puddly committed Apr 26, 2022
    Copy the full SHA
    0e03cc4 View commit details
377 changes: 8 additions & 369 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -5,373 +5,12 @@ on:
push:
pull_request: ~

env:
CACHE_VERSION: 1
DEFAULT_PYTHON: 3.7
PRE_COMMIT_HOME: ~/.cache/pre-commit

jobs:
# Separate job to pre-populate the base dependency cache
# This prevent upcoming jobs to do the same individually
prepare-base:
name: Prepare base dependencies
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.1.4
with:
python-version: ${{ matrix.python-version }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
restore-keys: |
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-
- name: Create Python virtual environment
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
python -m venv venv
. venv/bin/activate
pip install -U pip setuptools pre-commit
pip install -r requirements_test.txt
pip install -e .
pre-commit:
name: Prepare pre-commit environment
runs-on: ubuntu-latest
needs: prepare-base
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/setup-python@v2.1.4
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Restore pre-commit environment from cache
id: cache-precommit
uses: actions/cache@v2
with:
path: ${{ env.PRE_COMMIT_HOME }}
key: |
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
restore-keys: |
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-
- name: Install pre-commit dependencies
if: steps.cache-precommit.outputs.cache-hit != 'true'
run: |
. venv/bin/activate
pre-commit install-hooks
lint-black:
name: Check black
runs-on: ubuntu-latest
needs: pre-commit
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/setup-python@v2.1.4
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Restore pre-commit environment from cache
id: cache-precommit
uses: actions/cache@v2
with:
path: ${{ env.PRE_COMMIT_HOME }}
key: |
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Fail job if cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Run black
run: |
. venv/bin/activate
pre-commit run --hook-stage manual black --all-files --show-diff-on-failure
lint-flake8:
name: Check flake8
runs-on: ubuntu-latest
needs: pre-commit
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/setup-python@v2.1.4
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Restore pre-commit environment from cache
id: cache-precommit
uses: actions/cache@v2
with:
path: ${{ env.PRE_COMMIT_HOME }}
key: |
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Fail job if cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Register flake8 problem matcher
run: |
echo "::add-matcher::.github/workflows/matchers/flake8.json"
- name: Run flake8
run: |
. venv/bin/activate
pre-commit run --hook-stage manual flake8 --all-files
lint-isort:
name: Check isort
runs-on: ubuntu-latest
needs: pre-commit
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/setup-python@v2.1.4
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Restore pre-commit environment from cache
id: cache-precommit
uses: actions/cache@v2
with:
path: ${{ env.PRE_COMMIT_HOME }}
key: |
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Fail job if cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Run isort
run: |
. venv/bin/activate
pre-commit run --hook-stage manual isort --all-files --show-diff-on-failure
lint-codespell:
name: Check codespell
runs-on: ubuntu-latest
needs: pre-commit
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/setup-python@v2.1.4
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Restore pre-commit environment from cache
id: cache-precommit
uses: actions/cache@v2
with:
path: ${{ env.PRE_COMMIT_HOME }}
key: |
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
- name: Fail job if cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Register codespell problem matcher
run: |
echo "::add-matcher::.github/workflows/matchers/codespell.json"
- name: Run codespell
run: |
. venv/bin/activate
pre-commit run --hook-stage manual codespell --all-files --show-diff-on-failure
pytest:
runs-on: ubuntu-latest
needs: prepare-base
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
name: >-
Run tests Python ${{ matrix.python-version }}
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.1.4
id: python
with:
python-version: ${{ matrix.python-version }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Register Python problem matcher
run: |
echo "::add-matcher::.github/workflows/matchers/python.json"
- name: Install Pytest Annotation plugin
run: |
. venv/bin/activate
# Ideally this should be part of our dependencies
# However this plugin is fairly new and doesn't run correctly
# on a non-GitHub environment.
pip install pytest-github-actions-annotate-failures
- name: Run pytest
run: |
. venv/bin/activate
pytest \
-qq \
--timeout=9 \
--durations=10 \
--cov zigpy_deconz \
--cov-report=term-missing \
-o console_output_style=count \
-p no:sugar \
tests
- name: Upload coverage artifact
uses: actions/upload-artifact@v2.2.0
with:
name: coverage-${{ matrix.python-version }}
path: .coverage
- name: Coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: ${{ matrix.python-version }}
COVERALLS_PARALLEL: true
run: |
. venv/bin/activate
coveralls --service=github
coverage:
name: Process test coverage
runs-on: ubuntu-latest
needs: pytest
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.1.4
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@v2
with:
path: venv
key: >-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
steps.python.outputs.python-version }}-${{
hashFiles('requirements_test.txt') }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python virtual environment from cache"
exit 1
- name: Download all coverage artifacts
uses: actions/download-artifact@v2
- name: Combine coverage results
run: |
. venv/bin/activate
coverage combine coverage*/.coverage*
coverage report --fail-under=97
coverage xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
- name: Upload coverage to Coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
. venv/bin/activate
coveralls --service=github --finish
shared-ci:
uses: zigpy/workflows/.github/workflows/ci.yml@main
with:
CODE_FOLDER: zigpy_deconz
CACHE_VERSION: 2
PYTHON_VERSION_DEFAULT: 3.8.14
PRE_COMMIT_CACHE_PATH: ~/.cache/pre-commit
MINIMUM_COVERAGE_PERCENTAGE: 97
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
version: 3.7
version: 3.8
- name: Install wheel
run: >-
pip install wheel
Loading