Skip to content

Commit

Permalink
Merge branch '0.10' of https://github.com/openlightingproject/ola int…
Browse files Browse the repository at this point in the history
…o master-resync
  • Loading branch information
peternewman committed Dec 15, 2020
2 parents 0028d65 + 7841610 commit 1151e8d
Show file tree
Hide file tree
Showing 55 changed files with 2,295 additions and 1,309 deletions.
1 change: 1 addition & 0 deletions .codespellignorelines
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
to minimum and overiding(sic) to overriding, all of which may or may not
* Renamed RESONSE_INVALID_DESTINATION(sic) to RESPONSE_INVALID_DESTINATION in
* Rename CircularDepdendancyException(sic) to CircularDependencyException in
* Rename AppendMultipler(sic) to AppendMultiplier in the RDM messaging code
/^(?:([0-9]{1,3})(?:\s(THRU)\s(?:([0-9]{1,3}))?)?(?:\s(@)\s(?:([0-9]{1,3}|FULL))?)?)/;
* channel_range ::= "ALL" | "*" | channel "THRU" channel | channel > channel
/(?:([0-9]{1,3})(?:\s+THRU\s+([0-9]{0,3}))?)\s+@\s+([0-9]{0,3})$/);
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/annotation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@
name: annotation
on: [push, pull_request]
jobs:
flake8-annotation:
flake8-annotation-python2:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Flake8 with annotations
- name: Flake8 with annotations - Python 2
# Using the flake8 options in the .flake8 file
uses: peternewman/actions-flake8@python2
flake8-annotation-python3:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Flake8 with annotations - Python 3
# Using the flake8 options in the .flake8 file
uses: TrueBrain/actions-flake8@master
with:
only_warn: 1
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,13 @@ protoc/ola_protoc
protoc/ola_protoc.exe
protoc/ola_protoc_plugin
protoc/ola_protoc_plugin.exe
python/PyCompileTest.sh
python/examples/ola_rdm_set.py
python/ola/ClientWrapperTest.sh
python/ola/OlaClientTest.sh
python/ola/PidStoreLocation.py
python/ola/PidStoreTest.sh
python/ola/RDMTest.sh
python/ola/Version.py
python/ola/rpc/SimpleRpcControllerTest.sh
slp/slp_client
Expand Down
Loading

0 comments on commit 1151e8d

Please sign in to comment.