partial merge #19348: test: Bump linter versions

39d526bde48d98af4fa27906e85db0399b6aa8b1 test: Bump linter versions (Duncan Dean)

Pull request description:

  As per #19346, `mypy==0.700` was incompatible with Python 3.8.

  I've bumped the versions of all the linters to their latest stable versions.

  Checked with both Python 3.7 and 3.8 and everything still seems to work fine.

ACKs for top commit:
  hebasto:
    ACK 39d526bde48d98af4fa27906e85db0399b6aa8b1, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: f3ee7fda8095aa25aa68685e863076d52a6b82649770d24b0064d652763c0ceb8ebcbf9024fc74fca45c754e67b2a831dd070b3af23bc099140e6d27e89a5319
This commit is contained in:
MarcoFalke 2020-06-25 11:08:37 -04:00 committed by UdjinM6
parent 60b3c5a64e
commit 078ae49dc7
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
5 changed files with 11 additions and 13 deletions

View File

@ -6,11 +6,11 @@
export LC_ALL=C export LC_ALL=C
travis_retry pip3 install codespell==1.15.0 travis_retry pip3 install codespell==1.17.1
travis_retry pip3 install flake8==3.7.8 travis_retry pip3 install flake8==3.8.3
travis_retry pip3 install vulture==2.3 travis_retry pip3 install vulture==2.3
travis_retry pip3 install yq travis_retry pip3 install yq
SHELLCHECK_VERSION=v0.6.0 SHELLCHECK_VERSION=v0.7.1
curl -s "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/ curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}" export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"

View File

@ -15,8 +15,8 @@ RUN apt-get update && apt-get install $APT_ARGS python3-pip python3-setuptools &
# Python stuff # Python stuff
RUN pip3 install pyzmq # really needed? RUN pip3 install pyzmq # really needed?
RUN pip3 install jinja2 RUN pip3 install jinja2
RUN pip3 install flake8==3.7.8 RUN pip3 install flake8==3.8.3
RUN pip3 install codespell==1.15.0 RUN pip3 install codespell==1.17.1
RUN pip3 install vulture==2.3 RUN pip3 install vulture==2.3
RUN pip3 install yq RUN pip3 install yq
@ -43,8 +43,8 @@ RUN apt-get update && apt-get install $APT_ARGS python3-zmq && rm -rf /var/lib/a
RUN apt-get update && apt-get install $APT_ARGS cppcheck && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install $APT_ARGS cppcheck && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install $APT_ARGS imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install $APT_ARGS imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools && rm -rf /var/lib/apt/lists/*
ARG SHELLCHECK_VERSION=v0.6.0 ARG SHELLCHECK_VERSION=v0.7.1
RUN curl -s "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/ RUN curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
ENV PATH "/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}" ENV PATH "/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"
# This is a hack. It is needed because gcc-multilib and g++-multilib are conflicting with g++-arm-linux-gnueabihf. This is # This is a hack. It is needed because gcc-multilib and g++-multilib are conflicting with g++-arm-linux-gnueabihf. This is

View File

@ -237,9 +237,9 @@ Use the `-v` option for verbose output.
| Lint test | Dependency | Version [used by CI](../ci/lint/04_install.sh) | Installation | Lint test | Dependency | Version [used by CI](../ci/lint/04_install.sh) | Installation
|-----------|:----------:|:-------------------------------------------:|-------------- |-----------|:----------:|:-------------------------------------------:|--------------
| [`lint-python.sh`](lint/lint-python.sh) | [flake8](https://gitlab.com/pycqa/flake8) | [3.7.8](https://github.com/bitcoin/bitcoin/pull/15257) | `pip3 install flake8==3.7.8` | [`lint-python.sh`](lint/lint-python.sh) | [flake8](https://gitlab.com/pycqa/flake8) | [3.8.3](https://github.com/bitcoin/bitcoin/pull/19348) | `pip3 install flake8==3.8.3`
| [`lint-shell.sh`](lint/lint-shell.sh) | [ShellCheck](https://github.com/koalaman/shellcheck) | [0.6.0](https://github.com/bitcoin/bitcoin/pull/15166) | [details...](https://github.com/koalaman/shellcheck#installing) | [`lint-shell.sh`](lint/lint-shell.sh) | [ShellCheck](https://github.com/koalaman/shellcheck) | [0.7.1](https://github.com/bitcoin/bitcoin/pull/19348) | [details...](https://github.com/koalaman/shellcheck#installing)
| [`lint-spelling.sh`](lint/lint-spelling.sh) | [codespell](https://github.com/codespell-project/codespell) | [1.15.0](https://github.com/bitcoin/bitcoin/pull/16186) | `pip3 install codespell==1.15.0` | [`lint-spelling.sh`](lint/lint-spelling.sh) | [codespell](https://github.com/codespell-project/codespell) | [1.17.1](https://github.com/bitcoin/bitcoin/pull/19348) | `pip3 install codespell==1.17.1`
Please be aware that on Linux distributions all dependencies are usually available as packages, but could be outdated. Please be aware that on Linux distributions all dependencies are usually available as packages, but could be outdated.

View File

@ -38,7 +38,6 @@ enabled=(
# E711 # comparison to None should be 'if cond is None:' # E711 # comparison to None should be 'if cond is None:'
E714 # test for object identity should be "is not" E714 # test for object identity should be "is not"
E721 # do not compare types, use "isinstance()" E721 # do not compare types, use "isinstance()"
# E741 # do not use variables named "l", "O", or "I"
E742 # do not define classes named "l", "O", or "I" E742 # do not define classes named "l", "O", or "I"
E743 # do not define functions named "l", "O", or "I" E743 # do not define functions named "l", "O", or "I"
E901 # SyntaxError: invalid syntax E901 # SyntaxError: invalid syntax

View File

@ -41,7 +41,6 @@ disabled=(
disabled_gitian=( disabled_gitian=(
SC2094 # Make sure not to read and write the same file in the same pipeline. SC2094 # Make sure not to read and write the same file in the same pipeline.
SC2129 # Consider using { cmd1; cmd2; } >> file instead of individual redirects. SC2129 # Consider using { cmd1; cmd2; } >> file instead of individual redirects.
SC2230 # which is non-standard. Use builtin 'command -v' instead.
) )
EXIT_CODE=0 EXIT_CODE=0