From 155d5391cabdd58cd6db58eb8c4771dc8a71f76e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:38:12 +0000 Subject: [PATCH 1/3] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit e85896d4d10e11eb67a95c9c4ec31ffe47111d51) --- .github/workflows/build.yaml | 4 ++-- .github/workflows/debian.yml | 4 ++-- .github/workflows/isort.yml | 2 +- .github/workflows/lint.yaml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fb0bfe819e..8408df474e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -50,13 +50,13 @@ jobs: run: apt-get update -y # See comments beginning at # https://github.com/actions/runner/issues/763#issuecomment-1435474884 - # Without Git, actions/checkout@v3 will resort to REST and will not + # Without Git, actions/checkout@v4 will resort to REST and will not # create a .git folder or .git.config. The Problem Matcher looks for # .git/config to find where the root of the repo is, so it must be # present. - name: Install Git run: apt-get -y install git - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build tools shell: bash run: | diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index dbf285ba85..0ae5317ba0 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -21,13 +21,13 @@ jobs: run: apt-get update -y # See comments beginning at # https://github.com/actions/runner/issues/763#issuecomment-1435474884 - # Without Git, actions/checkout@v3 will resort to REST and will not + # Without Git, actions/checkout@v4 will resort to REST and will not # create a .git folder or .git.config. The Problem Matcher looks for # .git/config to find where the root of the repo is, so it must be # present. - name: Install Git run: apt-get -y install git - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build tools run: apt-get -y install devscripts adduser fakeroot sudo - name: Install build dependencies diff --git a/.github/workflows/isort.yml b/.github/workflows/isort.yml index f314e5b555..9aff6b16d1 100644 --- a/.github/workflows/isort.yml +++ b/.github/workflows/isort.yml @@ -8,5 +8,5 @@ jobs: isort: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: isort/isort-action@v1 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 731f617f5c..0c49e768a0 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -10,13 +10,13 @@ jobs: run: apt-get update -y # See comments beginning at # https://github.com/actions/runner/issues/763#issuecomment-1435474884 - # Without Git, actions/checkout@v3 will resort to REST and will not + # Without Git, actions/checkout@v4 will resort to REST and will not # create a .git folder or .git.config. The Problem Matcher looks for # .git/config to find where the root of the repo is, so it must be # present. - name: Install Git run: apt-get -y install git - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build tools shell: bash run: | @@ -260,7 +260,7 @@ jobs: name: weblint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js v18 uses: actions/setup-node@v3 with: From af3a814e9e297dc07ee8c9e730a0d273698ece80 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Tue, 10 Oct 2023 16:59:36 -0400 Subject: [PATCH 2/3] fix codespell typo --- common/web/SchemaParser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/web/SchemaParser.h b/common/web/SchemaParser.h index dfbd34f44a..ba49dba29e 100644 --- a/common/web/SchemaParser.h +++ b/common/web/SchemaParser.h @@ -91,7 +91,7 @@ class SchemaParser : public JsonParserInterface { /** * @brief Claim the RootValidator that was created by parsing the schema. * @returns A new Validator, or NULL if the schema wasn't valid. Ownership of - * the validtor is transferred to the caller. + * the validator is transferred to the caller. */ ValidatorInterface* ClaimRootValidator(); From 3b18f4e4a24acadfc6f3a092fd427ce7c408c4ce Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Tue, 10 Oct 2023 17:06:38 -0400 Subject: [PATCH 3/3] fix flake8 errors --- python/ola/StringUtils.py | 6 +++--- tools/rdm/ResponderTest.py | 6 +++--- tools/rdm/TestHelpers.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/ola/StringUtils.py b/python/ola/StringUtils.py index a0f51cfafd..4a4d7dd7de 100644 --- a/python/ola/StringUtils.py +++ b/python/ola/StringUtils.py @@ -32,11 +32,11 @@ def StringEscape(s): """Escape unprintable characters in a string.""" # TODO(Peter): How does this interact with the E1.20 Unicode flag? # We don't use sys.version_info.major to support Python 2.6. - if sys.version_info[0] == 2 and type(s) == str: + if sys.version_info[0] == 2 and isinstance(s, str): return s.encode('string-escape') - elif sys.version_info[0] == 2 and type(s) == unicode: + elif sys.version_info[0] == 2 and isinstance(s, unicode): return s.encode('unicode-escape') - elif type(s) == str: + elif isinstance(s, str): # All strings in Python 3 are unicode # This encode/decode pair gets us an escaped string return s.encode('unicode-escape').decode(encoding="ascii", diff --git a/tools/rdm/ResponderTest.py b/tools/rdm/ResponderTest.py index 93490306ff..23a6f532da 100644 --- a/tools/rdm/ResponderTest.py +++ b/tools/rdm/ResponderTest.py @@ -612,15 +612,15 @@ def _CheckForAckOrNack(self, response, unpacked_data, unpack_exception): return True def _EscapeData(self, data): - if type(data) == list: + if isinstance(data, list): return [self._EscapeData(i) for i in data] - elif type(data) == dict: + elif isinstance(data, dict): d = {} for k, v in data.items(): # We can't escape the key as then it may become a new key d[k] = self._EscapeData(v) return d - elif type(data) == str or type(data) == unicode: + elif isinstance(data, str) or isinstance(data, unicode): return StringEscape(data) else: return data diff --git a/tools/rdm/TestHelpers.py b/tools/rdm/TestHelpers.py index 51eb606de7..4a157bcf63 100644 --- a/tools/rdm/TestHelpers.py +++ b/tools/rdm/TestHelpers.py @@ -31,7 +31,7 @@ def ContainsUnprintable(s): """Check if a string s contain unprintable characters.""" # TODO(Peter): How does this interact with the E1.20 Unicode flag? - if type(s) == str or type(s) == unicode: + if isinstance(s, str) or isinstance(s, unicode): # All strings in Python 3 are unicode, Python 2 ones might not be return s != StringEscape(s) else: