summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-05-14 08:29:16 -0700
committerMonty Taylor <mordred@inaugust.com>2013-05-16 10:36:02 -0700
commit967d929207fa52c00acaa0a3e1b63bbe8e7f3835 (patch)
tree020f1534639d5bb31d657734d19519196ae72ab3
parent016a0b301e0ecfea5d84b09e7f1e22a86953c1c1 (diff)
downloadpython-openstackclient-967d929207fa52c00acaa0a3e1b63bbe8e7f3835.tar.gz
Migrate to flake8.
Fixes bug 1172444 Change-Id: Ieca721663aea2fd31753df4abfb5b01a7145b26a
-rw-r--r--openstackclient/shell.py4
-rw-r--r--tools/test-requires7
-rw-r--r--tox.ini8
3 files changed, 14 insertions, 5 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index cd5ab552..35d8255d 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -24,7 +24,7 @@ from cliff import app
from cliff import help
from openstackclient.common import clientmanager
-from openstackclient.common.commandmanager import CommandManager
+from openstackclient.common import commandmanager
from openstackclient.common import exceptions as exc
from openstackclient.common import openstackkeyring
from openstackclient.common import utils
@@ -63,7 +63,7 @@ class OpenStackShell(app.App):
super(OpenStackShell, self).__init__(
description=__doc__.strip(),
version=VERSION,
- command_manager=CommandManager('openstack.cli'))
+ command_manager=commandmanager.CommandManager('openstack.cli'))
# This is instantiated in initialize_app() only when using
# password flow auth
diff --git a/tools/test-requires b/tools/test-requires
index 405b408f..1eb2509c 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,3 +1,9 @@
+# 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
+
distribute>=0.6.24
coverage
@@ -5,7 +11,6 @@ discover
fixtures>=0.3.12
mock
openstack.nose_plugin
-pep8==1.3.3
sphinx>=1.1.2
testrepository>=0.0.13
testtools>=0.9.26
diff --git a/tox.ini b/tox.ini
index 9b5a843b..f6de18d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,7 @@ deps = -r{toxinidir}/tools/pip-requires
commands = python setup.py testr --testr-args='{posargs}'
[testenv:pep8]
-deps = pep8==1.3.3
-commands = pep8 --ignore=E126,E202,W602 --repeat --show-source openstackclient setup.py
+commands = flake8
[testenv:venv]
commands = {posargs}
@@ -22,3 +21,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
[tox:jenkins]
downloadcache = ~/cache/pip
+
+[flake8]
+ignore = E126,E202,W602,H402
+show-source = True
+exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools