From 95f2491ed89ac99b0d8bd006b4a13cbeb1eb96ce Mon Sep 17 00:00:00 2001 From: "Michael S. Pedersen" Date: Tue, 3 Dec 2019 11:38:32 +0000 Subject: NFVBENCH-153 Add support for python3 JIRA: NFVBENCH-153 Done using 2to3-3.6 with additional changes to fix data parsing and testing (tox) Signed-off-by: Michael S. Pedersen Change-Id: I242902f800da543d780507828c9bd1fbf409da6d --- tox.ini | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 337ee0d..6d12050 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py27,pep8,lint,docs,docs-linkcheck +envlist = py36,pep8,lint,docs,docs-linkcheck skipsdist = True [testenv] @@ -13,15 +13,19 @@ deps = -r{toxinidir}/requirements.txt commands = py.test -q --basetemp={envtmpdir} {posargs} [testenv:pep8] +basepython = python3 commands = flake8 {toxinidir} [testenv:lint] +basepython = python3 commands = pylint --rcfile pylint.rc nfvbench test [testenv:venv] +basepython = python3 commands = {posargs} [testenv:cover] +basepython = python3 commands = python setup.py testr --coverage --testr-args='{posargs}' [flake8] @@ -34,14 +38,17 @@ show-source = True #H233: Python 3.x incompatible use of print operator #H236: Python 3.x incompatible __metaclass__, use six.add_metaclass() #H302: import only modules. +#H304: No relative imports +#H306: imports not in alphabetical order #H404: multi line docstring should start without a leading new line #H405: multi line docstring summary not separated with an empty line #H904: Wrap long lines in parentheses instead of a backslash -ignore = E123,E125,H803,E302,E303,H104,H233,H236,H302,H404,H405,H904,D102,D100,D107 +ignore = E123,E125,H803,E302,E303,H104,H233,H236,H302,H304,H306,H404,H405,H904,D102,D100,D107 builtins = _ exclude=venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,dib-venv [testenv:docs] +basepython = python3 deps = -rdocs/requirements.txt commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html @@ -49,5 +56,6 @@ commands = whitelist_externals = echo [testenv:docs-linkcheck] +basepython = python3 deps = -rdocs/requirements.txt commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck -- cgit 1.2.3-korg