From ccbc605d8bc00944821ca43f0745bd8df6ebab02 Mon Sep 17 00:00:00 2001
From: David Shrewsbury <shrewsbury.dave@gmail.com>
Date: Wed, 14 Aug 2013 14:39:30 -0700
Subject: [PATCH] Switch from pep8 to flake8

Change-Id: I13a77aac647ca5e47d9451472aa1f79eacefe8ab
---
 setup.py            | 4 +---
 tools/test-requires | 2 +-
 tox.ini             | 8 ++++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 2b4328d..fbe54c2 100644
--- a/setup.py
+++ b/setup.py
@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import sys
 import setuptools
 from openstack.common import setup
+from libraclient import __version__
 
 requires = setup.parse_requirements()
 tests_requires = setup.parse_requirements(['tools/test-requires'])
@@ -36,8 +36,6 @@ try:
 except Exception:
     pass
 
-execfile('libraclient/__init__.py')
-
 
 setuptools.setup(
     name="python-libraclient",
diff --git a/tools/test-requires b/tools/test-requires
index cd2d418..01cdf46 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,4 +1,4 @@
-pep8
+flake8
 mock
 sphinx>=1.1.2
 testrepository>=0.0.8
diff --git a/tox.ini b/tox.ini
index a6dcfcb..7ee02c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,9 +13,13 @@ downloadcache = ~/cache/pip
 [testenv:py27]
 
 [testenv:pep8]
-deps = pep8
-commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg libraclient setup.py
+deps = flake8
+commands = flake8
 
 [testenv:pyflakes]
 deps = pyflakes
 commands = pyflakes libraclient
+
+[flake8]
+show-source = True
+exclude = .venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tests,build