clean up test job configuration
Make the py27 and py35 jobs run the same commands by putting them into the base testenv block. Move the doc8 job into the pep8 environment to run with the other linters. Change the way we invoke sphinx to run the doctests to avoid issues with pbr's sphinx integration. This also required removing skipdist and usedevelop to ensure that all of the pbr-generated files needed by sphinx exist before we run sphinx. Change the way sphinx is invoked in the docs environment to avoid issues with pbr's sphinx integration. Change-Id: If8a24428eca4512a66dbb361e55cd73aa92c4da8 Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
parent
481ee13445
commit
936a5d5f13
21
tox.ini
21
tox.ini
|
@ -1,11 +1,9 @@
|
|||
[tox]
|
||||
minversion = 2.0
|
||||
envlist = py35,py27,pypy,pep8
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
basepython = python3
|
||||
usedevelop = True
|
||||
install_command = pip install {opts} {packages}
|
||||
whitelist_externals = find
|
||||
rm
|
||||
|
@ -13,31 +11,32 @@ deps =
|
|||
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = python setup.py test --slowest --testr-args='{posargs}'
|
||||
commands =
|
||||
python setup.py testr --slowest --testr-args='{posargs}'
|
||||
sphinx-build -E -W -b doctest doc/source doc/build/doctest
|
||||
|
||||
[testenv:pep8]
|
||||
commands = flake8
|
||||
commands =
|
||||
flake8
|
||||
doc8 doc/source
|
||||
|
||||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
commands =
|
||||
commands =
|
||||
coverage erase
|
||||
find . -type f -name "*.pyc" -delete
|
||||
python setup.py test --coverage --testr-args='{posargs}'
|
||||
coverage report
|
||||
|
||||
[testenv:py27]
|
||||
commands =
|
||||
python setup.py testr --slowest --testr-args='{posargs}'
|
||||
python setup.py build_sphinx -b doctest
|
||||
doc8 doc/source
|
||||
basepython = python2.7
|
||||
|
||||
[testenv:docs]
|
||||
commands = rm -rf doc/build
|
||||
python setup.py build_sphinx
|
||||
commands =
|
||||
rm -rf doc/build
|
||||
sphinx-build -E -W -b html doc/source doc/build/html
|
||||
|
||||
[testenv:debug]
|
||||
commands = oslo_debug_helper {posargs}
|
||||
|
|
Loading…
Reference in New Issue