diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-05-10 18:19:59 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-05-17 14:44:42 -0700 |
| commit | 0493523854accbec303b37e7729a23fc730d5f7b (patch) | |
| tree | ca55e0f1662fa7683f97b17d1c05cb2911b64aef | |
| parent | 108b32da4217302eacb1eb0e20160b44572020ed (diff) | |
| download | python-keystoneclient-0493523854accbec303b37e7729a23fc730d5f7b.tar.gz | |
Migrate to flake8.
Fixes bug 1172444.
Change-Id: Icd51f5d925d84dcec7df7c83ca43cd87bc1b090f
| -rw-r--r-- | tests/test_service_catalog.py | 8 | ||||
| -rwxr-xr-x | tools/generate_authors.sh | 3 | ||||
| -rw-r--r-- | tools/test-requires | 7 | ||||
| -rw-r--r-- | tox.ini | 8 |
4 files changed, 17 insertions, 9 deletions
diff --git a/tests/test_service_catalog.py b/tests/test_service_catalog.py index 0f5620a..09ac19c 100644 --- a/tests/test_service_catalog.py +++ b/tests/test_service_catalog.py @@ -69,10 +69,10 @@ SERVICE_CATALOG = { "versionInfo": "https://compute.north.host/v1.1/", "versionList": "https://compute.north.host/"} ], - "endpoints_links":[{ - "rel":"next", - "href":"https://identity.north.host/v2.0/" - "endpoints?marker=2" + "endpoints_links": [{ + "rel": "next", + "href": "https://identity.north.host/v2.0/" + "endpoints?marker=2" }] }, { diff --git a/tools/generate_authors.sh b/tools/generate_authors.sh deleted file mode 100755 index c41f079..0000000 --- a/tools/generate_authors.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -git shortlog -se | cut -c8- diff --git a/tools/test-requires b/tools/test-requires index 41348f1..a9c0303 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 + coverage fixtures keyring mock mox -pep8==1.3.3 pycrypto sphinx>=1.1.2 testrepository>=0.0.13 @@ -14,7 +14,8 @@ deps = -r{toxinidir}/tools/pip-requires commands = python setup.py testr --testr-args='{posargs}' [testenv:pep8] -commands = pep8 --repeat --show-source --ignore=E711,E712,E125,E126 --exclude=.venv,.tox,dist,doc,*egg . +commands = + flake8 [testenv:venv] commands = {posargs} @@ -24,3 +25,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}' [tox:jenkins] downloadcache = ~/cache/pip + +[flake8] +ignore = E711,E712,E125,E126,F,H +show-source = True +exclude = .venv,.tox,dist,doc,*egg |