Skip to content

Commit

Permalink
Migrate to flake8.
Browse files Browse the repository at this point in the history
Fixes bug 1172444.

Change-Id: I0d8faa0819738456a28aaf5cc859f510a2b3ed68
  • Loading branch information
emonty committed May 25, 2013
1 parent 1a0b7b0 commit 9d4db6f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
9 changes: 2 additions & 7 deletions run_tests.sh
Expand Up @@ -102,13 +102,8 @@ function copy_subunit_log {
}

function run_pep8 {
echo "Running pep8 ..."
srcfiles="--exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*"
srcfiles+=",*egg,build ."
# Just run PEP8 in current environment
#
ignore="--ignore=E12,E711,E721,E712"
${wrapper} pep8 ${ignore} --show-source ${srcfiles}
echo "Running flake8 ..."
${wrapper} flake8
}

TESTRTESTS="testr run --parallel $testropts"
Expand Down
7 changes: 6 additions & 1 deletion 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
discover
fixtures>=0.3.12
keyring
mock
pep8==1.3.3
sphinx>=1.1.2
testrepository>=0.0.13
testtools>=0.9.26
10 changes: 6 additions & 4 deletions tox.ini
Expand Up @@ -12,10 +12,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=E12,E711,E721,E712 --show-source \
--exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build .
commands = flake8

[testenv:venv]
commands = {posargs}
Expand All @@ -25,3 +22,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'

[tox:jenkins]
downloadcache = ~/cache/pip

[flake8]
ignore = E12,E711,E721,E712,F,H
show-source = True
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build

0 comments on commit 9d4db6f

Please sign in to comment.