From b343c1c22d1caa426d0afac1255ca92dcc72fa4b Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 18 May 2013 08:37:46 -0700
Subject: Migrate to flake8.

Fixes bug 1172444.

Change-Id: Icd6c41f9f5b799ed0b121dc3a3af9d4304fa0eff
---
 tools/test-requires |  7 ++++++-
 tox.ini             | 27 ++++++---------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/tools/test-requires b/tools/test-requires
index 18557f0..1143ef2 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,11 +1,16 @@
 distribute>=0.6.24
 
+# Install bounded pep8/pyflakes first, then let flake8 install
+pep8==1.4.5
+pyflakes==0.7.2
+flake8==2.0
+hacking>=0.5.3,<0.6
+
 mox
 nose
 nose-exclude
 nosexcover
 openstack.nose_plugin
 nosehtmloutput
-pep8==1.2
 setuptools-git>=0.4
 sphinx>=1.1.2
diff --git a/tox.ini b/tox.ini
index 48361a0..405ddf5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,7 @@ deps = -r{toxinidir}/tools/pip-requires
 commands = nosetests
 
 [testenv:pep8]
-deps = pep8==1.1
-commands = pep8 --repeat --show-source heatclient setup.py
+commands = flake8
 
 [testenv:venv]
 commands = {posargs}
@@ -25,22 +24,8 @@ commands = nosetests --cover-erase --cover-package=heatclient --with-xcoverage
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
-[testenv:jenkins26]
-basepython = python2.6
-setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
-
-[testenv:jenkins27]
-basepython = python2.7
-setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
-
-[testenv:jenkinscover]
-deps = file://{toxinidir}/.cache.bundle
-setenv = NOSE_WITH_XUNIT=1
-commands = nosetests --cover-erase --cover-package=heatclient --with-xcoverage
-
-[testenv:jenkinsvenv]
-deps = file://{toxinidir}/.cache.bundle
-setenv = NOSE_WITH_XUNIT=1
-commands = {posargs}
+[flake8]
+show-source = True
+ignore = E12,H,F403,F821,F841
+builtins = _
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg
-- 
cgit v1.2.1