From f4948aec9d11064570b2a4e43adac49888e8f122 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 13 Apr 2018 16:16:14 -0400 Subject: set default python to python3 Set the default python to python3 except for the py27 environment. We have to set that explicitly to override the new default. Have py27 and py3* jobs run same commands by removing the commands entry for py27. The pep8 rules under python 3 are different, so we need to fix a couple of issues with blank space. The E721 rule is ignored entirely because we are not yet using a version of flake8 that supports ignoring individual rules on specific lines, although the instructions for that are added so that when we upgrade flake8 to a newer version we can remove the global rule. Change-Id: Id236b0632a83a188958130d04f1e9c476c5ace65 Signed-off-by: Doug Hellmann --- tox.ini | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index d4c420a..fa4214b 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ envlist = cover, update-states [testenv] +basepython = python3 setenv = VIRTUAL_ENV={envdir} BRANCH_NAME=master CLIENT_NAME=taskflow @@ -50,6 +51,7 @@ commands = {posargs} [flake8] builtins = _ exclude = .venv,.tox,dist,doc,*egg,.git,build,tools +ignore = E721 [hacking] import_exceptions = six.moves @@ -64,19 +66,13 @@ import_exceptions = six.moves ignore-path = doc/*/target,doc/*/build* [testenv:py27] -deps = .[test,workers,zookeeper,database,redis,eventlet] - -r{toxinidir}/doc/requirements.txt -commands = - python setup.py testr --slowest --testr-args='{posargs}' - sphinx-build -b doctest doc/source doc/build - doc8 --ignore-path "doc/source/history.rst" doc/source +basepython = python2.7 [testenv:releasenotes] deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] -basepython = python3 install_command = pip install {opts} {packages} deps = -c{toxinidir}/lower-constraints.txt -- cgit v1.2.1