diff options
author | Shreenidhi Shedi <53473811+sshedi@users.noreply.github.com> | 2021-09-01 19:53:55 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-01 09:23:55 -0500 |
commit | 58c2de4c97de6cfa6edbf5319641f2ef71284895 (patch) | |
tree | 3f8806eeb1e61a408f85f48b9a07d85b981acf50 /tools | |
parent | 76cff793840be63a69a74293170122c189ebaead (diff) | |
download | vyos-cloud-init-58c2de4c97de6cfa6edbf5319641f2ef71284895.tar.gz vyos-cloud-init-58c2de4c97de6cfa6edbf5319641f2ef71284895.zip |
Fix `make style-check` errors (#1000)
Using flake8 inplace of pyflakes
Renamed run-pyflakes -> run-flake8
Changed target name to flake8 in Makefile
With pyflakes we can't suppress warnings/errors in few required places.
flake8 is flexible in that regard. Hence using flake8 seems to be a
better choice here.
flake8 does the job of pep8 anyway.
So, removed pep8 target from Makefile along with tools/run-pep8 script.
Included setup.py in flake8 checks
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run-flake8 (renamed from tools/run-pyflakes) | 4 | ||||
-rwxr-xr-x | tools/run-pep8 | 21 |
2 files changed, 2 insertions, 23 deletions
diff --git a/tools/run-pyflakes b/tools/run-flake8 index 179afebe..0021cdb9 100755 --- a/tools/run-pyflakes +++ b/tools/run-flake8 @@ -2,7 +2,7 @@ CR=" " -pycheck_dirs=( "cloudinit/" "tests/" "tools/" ) +pycheck_dirs=( "cloudinit/" "tests/" "tools/" "setup.py" ) set -f if [ $# -eq 0 ]; then @@ -11,7 +11,7 @@ else files=( "$@" ) fi -cmd=( "python3" -m "pyflakes" "${files[@]}" ) +cmd=( "python3" -m "flake8" "${files[@]}" ) echo "Running: " "${cmd[@]}" 1>&2 exec "${cmd[@]}" diff --git a/tools/run-pep8 b/tools/run-pep8 deleted file mode 100755 index 4bd0bbfb..00000000 --- a/tools/run-pep8 +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -pycheck_dirs=( "cloudinit/" "tests/" "tools/" ) - -CR=" -" -[ "$1" = "-v" ] && { verbose="$1"; shift; } || verbose="" - -set -f -if [ $# -eq 0 ]; then unset IFS - IFS="$CR" - files=( "${bin_files[@]}" "${pycheck_dirs[@]}" ) - unset IFS -else - files=( "$@" ) -fi - -myname=${0##*/} -cmd=( "${myname#run-}" $verbose "${files[@]}" ) -echo "Running: " "${cmd[@]}" 1>&2 -exec "${cmd[@]}" |