From 58c2de4c97de6cfa6edbf5319641f2ef71284895 Mon Sep 17 00:00:00 2001
From: Shreenidhi Shedi <53473811+sshedi@users.noreply.github.com>
Date: Wed, 1 Sep 2021 19:53:55 +0530
Subject: 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
---
 tools/run-flake8   | 17 +++++++++++++++++
 tools/run-pep8     | 21 ---------------------
 tools/run-pyflakes | 17 -----------------
 3 files changed, 17 insertions(+), 38 deletions(-)
 create mode 100755 tools/run-flake8
 delete mode 100755 tools/run-pep8
 delete mode 100755 tools/run-pyflakes

(limited to 'tools')

diff --git a/tools/run-flake8 b/tools/run-flake8
new file mode 100755
index 00000000..0021cdb9
--- /dev/null
+++ b/tools/run-flake8
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+CR="
+"
+pycheck_dirs=( "cloudinit/" "tests/" "tools/"  "setup.py" )
+
+set -f
+if [ $# -eq 0 ]; then
+   files=( "${pycheck_dirs[@]}" )
+else
+   files=( "$@" )
+fi
+
+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[@]}"
diff --git a/tools/run-pyflakes b/tools/run-pyflakes
deleted file mode 100755
index 179afebe..00000000
--- a/tools/run-pyflakes
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-CR="
-"
-pycheck_dirs=( "cloudinit/" "tests/" "tools/" )
-
-set -f
-if [ $# -eq 0 ]; then
-   files=( "${pycheck_dirs[@]}" )
-else
-   files=( "$@" )
-fi
-
-cmd=( "python3" -m "pyflakes" "${files[@]}" )
-
-echo "Running: " "${cmd[@]}" 1>&2
-exec "${cmd[@]}"
-- 
cgit v1.2.3