From 996a0f5b9ce7dc95a7b9f9f4771ce701a0675b72 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 21 Oct 2017 18:17:28 +0200
Subject: [PATCH] Run pep8 everywhere

Since the Zuul v2 files are removed, we can lint pep8 with less changes
everywhere. Enable pep8 linting everywhere and fix remaining problems.

Depends-On: Id67d0149b645bd23e460cef65719541f76f0967b
Change-Id: I0ac0709b05912d00d02a51d732b1cf12eaf888a5
---
 tools/add-projects-to-main.py    | 2 --
 tools/ci2project.py              | 2 +-
 tools/normalize_projects_yaml.py | 2 +-
 tox.ini                          | 4 +---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/add-projects-to-main.py b/tools/add-projects-to-main.py
index 818f04663b..f661ea9b69 100644
--- a/tools/add-projects-to-main.py
+++ b/tools/add-projects-to-main.py
@@ -14,8 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import collections
-
 import ruamel.yaml
 
 
diff --git a/tools/ci2project.py b/tools/ci2project.py
index 0b7c3e9370..b98915d778 100644
--- a/tools/ci2project.py
+++ b/tools/ci2project.py
@@ -62,7 +62,7 @@ while not done:
     changes = json.loads(r.text[4:])
     for change in changes:
         if (not change.get('labels') or
-            not change.get('labels').get('Verified')):
+                not change.get('labels').get('Verified')):
             continue
         for key, value in change['labels']['Verified'].items():
             if key == 'value':
diff --git a/tools/normalize_projects_yaml.py b/tools/normalize_projects_yaml.py
index f8635fb640..10dcd47af2 100755
--- a/tools/normalize_projects_yaml.py
+++ b/tools/normalize_projects_yaml.py
@@ -31,7 +31,7 @@ def main():
 
     for project in data:
         if ('upstream' in project and
-            'track-upstream' not in project.get('options', [])):
+                'track-upstream' not in project.get('options', [])):
             del project['upstream']
 
     with open('gerrit/projects.yaml', 'w') as out:
diff --git a/tox.ini b/tox.ini
index ac5cfc8a56..6b3bba01f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,9 +10,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 [testenv:linters]
 commands =
   {toxinidir}/tools/run-bashate.sh
-  # TODO(jaegerandi): Remove parameter to test everywhere once
-  # Zuul v2 files have been removed
-  flake8 jenkins/scripts roles playbooks nodepool
+  flake8
 
 [testenv:gerrit]
 deps = PyYAML