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
---
 Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5fb0fcbf..0c015dae 100644
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,10 @@ all: check
 
 check: check_version test yaml
 
-style-check: pep8 $(pyflakes)
+style-check: flake8
 
-pep8:
-	@$(CWD)/tools/run-pep8
-
-pyflakes:
-	@$(CWD)/tools/run-pyflakes
+flake8:
+	@$(CWD)/tools/run-flake8
 
 unittest: clean_pyc
 	python3 -m pytest -v tests/unittests cloudinit
@@ -86,6 +83,6 @@ deb-src:
 doc:
 	tox -e doc
 
-.PHONY: test pyflakes clean pep8 rpm srpm deb deb-src yaml
+.PHONY: test flake8 clean rpm srpm deb deb-src yaml
 .PHONY: check_version pip-test-requirements pip-requirements clean_pyc
 .PHONY: unittest style-check doc
-- 
cgit v1.2.3