pycodestyle: Replace pep8

pep8 has been renamed to pycodestyle and will be removed in a future
release.

This patch replaces pep8 by pycodestyle and adding some settings for
pycodestyle.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2017-12-15 10:50:14 +09:00 committed by FUJITA Tomonori
parent 870dcab678
commit bdf3549563
5 changed files with 52 additions and 36 deletions

View File

@ -7,7 +7,7 @@ env:
- TOX_ENV=py34 - TOX_ENV=py34
- TOX_ENV=py35 - TOX_ENV=py35
- TOX_ENV=pypy26 - TOX_ENV=pypy26
- TOX_ENV=pep8 - TOX_ENV=pycodestyle
services: services:
- docker - docker

View File

@ -20,7 +20,7 @@ style.
# You can send patches by "git send-email" command # You can send patches by "git send-email" command
$ git send-email --to="ryu-devel@lists.sourceforge.net" *.patch $ git send-email --to="ryu-devel@lists.sourceforge.net" *.patch
Please check your changes with pep8 and run unittests to make sure Please check your changes with pycodestyle(pep8) and run unittests to make sure
that they don't break the existing features. The following command that they don't break the existing features. The following command
does both for you. does both for you.
@ -29,7 +29,7 @@ does both for you.
# Install dependencies of tests # Install dependencies of tests
$ pip install -r tools/test-requires $ pip install -r tools/test-requires
# Execute unit tests and pep8 # Execute unit tests and pycodestyle(pep8)
$ ./run_tests.sh $ ./run_tests.sh
Of course, you are encouraged to add unittests when you add new Of course, you are encouraged to add unittests when you add new

View File

@ -8,16 +8,16 @@ usage() {
echo "Usage: $0 [OPTION]..." echo "Usage: $0 [OPTION]..."
echo "Run Ryu's test suite(s)" echo "Run Ryu's test suite(s)"
echo "" echo ""
echo " -V, --virtual-env Always use virtualenv. Install automatically if not present" echo " -V, --virtual-env Always use virtualenv. Install automatically if not present"
echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment" echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment"
echo " -c, --coverage Generate coverage report" echo " -c, --coverage Generate coverage report"
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added." echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
echo " -p, --pep8 Just run pep8" echo " -p, --pycodestyle, --pep8 Just run pycodestyle(pep8)"
echo " -P, --no-pep8 Don't run pep8" echo " -P, --no-pycodestyle, --no-pep8 Don't run pycodestyle(pep8)"
echo " -l, --pylint Just run pylint" echo " -l, --pylint Just run pylint"
echo " -i, --integrated Run integrated test" echo " -i, --integrated Run integrated test"
echo " -v, --verbose Run verbose pylint analysis" echo " -v, --verbose Run verbose pylint analysis"
echo " -h, --help Print this usage message" echo " -h, --help Print this usage message"
echo "" echo ""
echo "Note: with no options specified, the script will try to run the tests in a virtual environment," echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"
echo " If no virtualenv is found, the script will ask if you would like to create one. If you " echo " If no virtualenv is found, the script will ask if you would like to create one. If you "
@ -31,8 +31,8 @@ process_option() {
-V|--virtual-env) always_venv=1; never_venv=0;; -V|--virtual-env) always_venv=1; never_venv=0;;
-N|--no-virtual-env) always_venv=0; never_venv=1;; -N|--no-virtual-env) always_venv=0; never_venv=1;;
-f|--force) force=1;; -f|--force) force=1;;
-p|--pep8) just_pep8=1; never_venv=1; always_venv=0;; -p|--pycodestyle|--pep8) just_pycodestyle=1; never_venv=1; always_venv=0;;
-P|--no-pep8) no_pep8=1;; -P|--no-pycodestyle|--no-pep8) no_pycodestyle=1;;
-l|--pylint) just_pylint=1;; -l|--pylint) just_pylint=1;;
-i|--integrated) integrated=1;; -i|--integrated) integrated=1;;
-c|--coverage) coverage=1;; -c|--coverage) coverage=1;;
@ -46,8 +46,8 @@ venv=.venv
with_venv=tools/with_venv.sh with_venv=tools/with_venv.sh
always_venv=0 always_venv=0
never_venv=0 never_venv=0
just_pep8=0 just_pycodestyle=0
no_pep8=0 no_pycodestyle=0
just_pylint=0 just_pylint=0
integrated=0 integrated=0
force=0 force=0
@ -103,20 +103,26 @@ run_pylint() {
export PYTHONPATH=$OLD_PYTHONPATH export PYTHONPATH=$OLD_PYTHONPATH
} }
run_pep8() { run_pycodestyle() {
echo "Running pep8 ..." PYCODESTYLE=$(which pycodestyle || which pep8)
if [ -z "${PYCODESTYLE}" ]
then
echo "Please install pycodestyle or pep8"
return 1
fi
echo "Running $(basename ${PYCODESTYLE}) ..."
PEP8_OPTIONS="--repeat --show-source" PYCODESTYLE_OPTIONS="--repeat --show-source"
PEP8_INCLUDE="ryu setup*.py" PYCODESTYLE_INCLUDE="ryu setup*.py"
PEP8_LOG=pep8.log PYCODESTYLE_LOG=pycodestyle.log
${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE | tee $PEP8_LOG ${wrapper} ${PYCODESTYLE} $PYCODESTYLE_OPTIONS $PYCODESTYLE_INCLUDE | tee $PYCODESTYLE_LOG
} }
run_integrated() { run_integrated() {
echo "Running integrated test ..." echo "Running integrated test ..."
INTEGRATED_TEST_RUNNER="./ryu/tests/integrated/run_tests_with_ovs12.py" INTEGRATED_TEST_RUNNER="./ryu/tests/integrated/run_tests_with_ovs12.py"
sudo PYTHONPATH=. nosetests -s $INTEGRATED_TEST_RUNNER sudo PYTHONPATH=. nosetests -s $INTEGRATED_TEST_RUNNER
} }
#NOSETESTS="nosetests $noseopts $noseargs" #NOSETESTS="nosetests $noseopts $noseargs"
NOSETESTS="${PYTHON} ./ryu/tests/run_tests.py $noseopts $noseargs" NOSETESTS="${PYTHON} ./ryu/tests/run_tests.py $noseopts $noseargs"
@ -161,8 +167,8 @@ if [ $coverage -eq 1 ]; then
${wrapper} coverage erase ${wrapper} coverage erase
fi fi
if [ $just_pep8 -eq 1 ]; then if [ $just_pycodestyle -eq 1 ]; then
run_pep8 run_pycodestyle
exit exit
fi fi
if [ $just_pylint -eq 1 ]; then if [ $just_pylint -eq 1 ]; then
@ -177,8 +183,8 @@ fi
run_tests run_tests
RV=$? RV=$?
if [ $no_pep8 -eq 0 ]; then if [ $no_pycodestyle -eq 0 ]; then
run_pep8 run_pycodestyle
fi fi
if [ $coverage -eq 1 ]; then if [ $coverage -eq 1 ]; then

View File

@ -1,6 +1,6 @@
coverage coverage
mock mock
nose nose
pep8 pycodestyle
pylint pylint
formencode formencode

24
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py27,py34,py35,pypy26,pep8 envlist = py27,py34,py35,pypy26,pycodestyle
[testenv] [testenv]
deps = deps =
@ -30,15 +30,25 @@ commands =
{[testenv]commands} {[testenv]commands}
{[testenv:scenario]commands} {[testenv:scenario]commands}
[testenv:pep8] [testenv:pycodestyle]
deps = deps =
-U -U
--no-cache-dir --no-cache-dir
pep8 pycodestyle
commands = commands =
pep8 pycodestyle
[pycodestyle]
exclude = pbr-*,.venv,.tox,.git,doc,dist,tools,vcsversion.py,.pyc,ryu/contrib
# W503: line break occurred before a binary operator
# E116: unexpected indentation (comment)
# E402: module level import not at top of file
# E501: line too long (>79 characters)
# E722: do not use bare except, specify exception instead
# E731: do not assign a lambda expression, use a def
# E741: do not use variables named 'l', 'O', or 'I'
ignore = W503,E116,E402,E501,E722,E731,E741
[pep8] [pep8]
exclude = pbr-*,.venv,.tox,.git,doc,dist,tools,vcsversion.py,.pyc,ryu/contrib,dictconfig.py exclude = pbr-*,.venv,.tox,.git,doc,dist,tools,vcsversion.py,.pyc,ryu/contrib
ignore = E113,E116,E402,E711,E731,E501,W503 ignore = W503,E116,E402,E501,E722,E731,E741