always use pip constraints

This flips the tox.ini to always use constraints installation for
all targets. It drops the extra -constraints targets in the process.
This makes it so there is no developer change required to operate in our
new world order.

Change-Id: I2b56835edb2d75b7c871aae030e909578dbb958d
Depends-On: Iecd35d6bc3b1e9e0ed31b48a34e4149d34d55ac2
This commit is contained in:
Andreas Jaeger 2016-02-26 19:44:07 +01:00
parent bda22d6495
commit 379f272924

45
tox.ini
View File

@ -9,9 +9,7 @@ envlist = py27,pep8
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0 PYTHONHASHSEED=0
usedevelop = True usedevelop = True
install_command = install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
constraints: {[testenv:common-constraints]install_command}
pip install {opts} {packages}
# TODO(mriedem): Move oslo.versionedobjects[fixtures] to test-requirements.txt # TODO(mriedem): Move oslo.versionedobjects[fixtures] to test-requirements.txt
# after I937823ffeb95725f0b55e298ebee1857d6482883 lands. # after I937823ffeb95725f0b55e298ebee1857d6482883 lands.
@ -28,18 +26,16 @@ whitelist_externals = bash
passenv = *_proxy *_PROXY passenv = *_proxy *_PROXY
[testenv:releasenotes] [testenv:releasenotes]
# NOTE(jaegerandi): This target does not use constraints because
# upstream infra does not yet support it. Once that's fixed, we can
# drop the install_command.
install_command = pip install -U --force-reinstall {opts} {packages}
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:common-constraints]
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
[testenv:functional] [testenv:functional]
setenv = setenv =
OS_TEST_PATH = ./cinder/tests/functional OS_TEST_PATH = ./cinder/tests/functional
[testenv:py34-constraints]
install_command = {[testenv:common-constraints]install_command}
[testenv:pep8] [testenv:pep8]
commands = commands =
flake8 {posargs} . flake8 {posargs} .
@ -49,16 +45,6 @@ commands =
{toxinidir}/tools/config/check_uptodate.sh {toxinidir}/tools/config/check_uptodate.sh
{toxinidir}/tools/check_exec.py {toxinidir}/cinder {toxinidir}/tools/check_exec.py {toxinidir}/cinder
[testenv:pep8-constraints]
install_command = {[testenv:common-constraints]install_command}
commands =
flake8 {posargs} .
# Check that .po and .pot files are valid:
bash -c "find cinder -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
{toxinidir}/tools/config/check_uptodate.sh --checkopts
{toxinidir}/tools/config/check_uptodate.sh
{toxinidir}/tools/check_exec.py {toxinidir}/cinder
[testenv:fast8] [testenv:fast8]
# Use same environment directory as pep8 env to save space and install time # Use same environment directory as pep8 env to save space and install time
envdir = {toxworkdir}/pep8 envdir = {toxworkdir}/pep8
@ -70,22 +56,17 @@ deps = -r{toxinidir}/requirements.txt
pylint==0.26.0 pylint==0.26.0
commands = bash tools/lintstack.sh commands = bash tools/lintstack.sh
[testenv:pylint-constraints]
install_command = {[testenv:common-constraints]install_command}
deps = {[testenv:pylint]deps}
commands = {[testenv:pylint]commands}
[testenv:cover] [testenv:cover]
# Also do not run test_coverage_ext tests while gathering coverage as those # Also do not run test_coverage_ext tests while gathering coverage as those
# tests conflict with coverage. # tests conflict with coverage.
# NOTE(jaegerandi): This target does not use constraints because
# upstream infra does not yet support it. Once that's fixed, we can
# drop the install_command.
install_command = pip install -U --force-reinstall {opts} {packages}
commands = commands =
python setup.py testr --coverage \ python setup.py testr --coverage \
--testr-args='^(?!.*test.*coverage).*$' --testr-args='^(?!.*test.*coverage).*$'
[testenv:cover-constraints]
install_command = {[testenv:common-constraints]install_command}
commands = {[testenv:cover]commands}
[testenv:genconfig] [testenv:genconfig]
sitepackages = False sitepackages = False
envdir = {toxworkdir}/pep8 envdir = {toxworkdir}/pep8
@ -97,10 +78,10 @@ envdir = {toxworkdir}/pep8
commands = {toxinidir}/tools/config/generate_sample.sh from_tox --nosamplefile commands = {toxinidir}/tools/config/generate_sample.sh from_tox --nosamplefile
[testenv:venv] [testenv:venv]
commands = {posargs} # NOTE(jaegerandi): This target does not use constraints because
# upstream infra does not yet support it. Once that's fixed, we can
[testenv:venv-constraints] # drop the install_command.
install_command = {[testenv:common-constraints]install_command} install_command = pip install -U --force-reinstall {opts} {packages}
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]