Merge "Update tox configuration file to reduce duplication"

This commit is contained in:
Jenkins 2016-12-21 00:15:18 +00:00 committed by Gerrit Code Review
commit 7d364aebd8
1 changed files with 15 additions and 29 deletions

44
tox.ini
View File

@ -1,33 +1,32 @@
[tox]
minversion = 1.6
minversion = 2.3.1
envlist = py34,py27,pep8
skipsdist = True
[testenv]
basepython =
python2.7
debug-py27: python2.7
py34: python3.4
debug-py34: python3.4
setenv =
VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
deps = -r{toxinidir}/test-requirements.txt
commands = ostestr --slowest {posargs}
commands =
bandit: bandit -c bandit.yaml -r glance -n5 -p gate
cover: python setup.py testr --coverage --testr-args='^(?!.*test.*coverage).*$'
debug: oslo_debug_helper {posargs}
debug{-py27,-py34}: oslo_debug_helper {posargs}
docs: python setup.py build_sphinx
py27: ostestr --slowest {posargs}
releasenotes: sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
venv: {posargs}
whitelist_externals = bash
passenv = *_proxy *_PROXY
[testenv:releasenotes]
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:debug]
commands = oslo_debug_helper {posargs}
[testenv:debug-py27]
basepython = python2.7
commands = oslo_debug_helper {posargs}
[testenv:debug-py34]
basepython = python3.4
commands = oslo_debug_helper {posargs}
[testenv:py34]
commands =
lockutils-wrapper python setup.py testr --slowest --testr-args='glance.tests.unit'
@ -63,13 +62,6 @@ commands =
# Check that .po and .pot files are valid:
bash -c "find glance -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[testenv:cover]
setenv = VIRTUAL_ENV={envdir}
commands = python setup.py testr --coverage --testr-args='^(?!.*test.*coverage).*$'
[testenv:venv]
commands = {posargs}
[testenv:genconfig]
commands =
oslo-config-generator --config-file etc/oslo-config-generator/glance-api.conf
@ -79,9 +71,6 @@ commands =
oslo-config-generator --config-file etc/oslo-config-generator/glance-manage.conf
oslo-config-generator --config-file etc/oslo-config-generator/glance-glare.conf
[testenv:docs]
commands = python setup.py build_sphinx
[testenv:api-ref]
# This environment is called from CI scripts to test and publish
# the API Ref to developer.openstack.org.
@ -92,9 +81,6 @@ commands =
rm -rf api-ref/build
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
[testenv:bandit]
commands = bandit -c bandit.yaml -r glance -n5 -p gate
[flake8]
# TODO(dmllr): Analyze or fix the warnings blacklisted below
# E711 comparison to None should be 'if cond is not None:'