From a5062315f5313f511fc079d263dfbe1dd3f897a1 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 17 May 2013 02:18:56 +0000
Subject: [PATCH] Revert "Fix ./run_tests.sh --pep8"

We are explicitly trying to get rid of scripts like this and flake8 makes
this one non-necessary.
Fix run_tests.sh to run flake8 properly.

This reverts commit 42243d6eb221d52bf6f62f835726cbe026e43447

Change-Id: I435e34b6acde7931a75f456ccc88da6476581643
---
 run_tests.sh      |  4 +++-
 tools/run_pep8.sh | 16 ----------------
 tox.ini           | 17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100755 tools/run_pep8.sh

diff --git a/run_tests.sh b/run_tests.sh
index 6ddaee62e..668a5a88a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -161,7 +161,9 @@ function copy_subunit_log {
 }
 
 function run_pep8 {
-  bash -c "${wrapper} tools/run_pep8.sh"
+  echo "Running flake8 ..."
+
+  ${wrapper} flake8
 }
 
 
diff --git a/tools/run_pep8.sh b/tools/run_pep8.sh
deleted file mode 100755
index fa7978a53..000000000
--- a/tools/run_pep8.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "Running flake8 ..."
-# E711/E712 comparison to False should be 'if cond is False:' or 'if not cond:'
-#        query = query.filter(Component.disabled == False)
-# E125 continuation line does not distinguish itself from next logical line
-# H301 one import per line
-# H302 import only modules
-# TODO(marun) H901,902 use the not operator inline for clarity
-# TODO(markmcclain) H202 assertRaises Exception too broad
-PEP8_IGNORE="E711,E712,E125,H301,H302,H901,H902,H202"
-PEP8_BUILTINS="_"
-PEP8_EXCLUDE=".venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools"
-flake8 --exclude=$PEP8_EXCLUDE --ignore=$PEP8_IGNORE --show-source --builtins=$PEP8_BUILTINS .
diff --git a/tox.ini b/tox.ini
index fa00a9731..d266c7b25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,8 @@ sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-commands = bash ./tools/run_pep8.sh
+commands =
+  flake8
 
 [testenv:i18n]
 commands = python ./tools/check_i18n.py ./quantum ./tools/i18n_cfg.py
@@ -27,3 +28,17 @@ commands =
 
 [testenv:venv]
 commands = {posargs}
+
+[flake8]
+# E711/E712 comparison to False should be 'if cond is False:' or 'if not cond:'
+#        query = query.filter(Component.disabled == False)
+# E125 continuation line does not distinguish itself from next logical line
+# H301 one import per line
+# H302 import only modules
+# TODO(marun) H404 multi line docstring should start with a summary
+# TODO(marun) H901,902 use the not operator inline for clarity
+# TODO(markmcclain) H202 assertRaises Exception too broad
+ignore = E711,E712,E125,H301,H302,H404,H901,H902,H202
+show-source = true
+builtins = _
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools
-- 
2.45.2