From 840c54f0d3b99f5bd11d24a30d7dcc2cd54ec64b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 26 Aug 2016 18:09:35 +0200 Subject: [PATCH] Cleanup tox.ini: Remove obsolete constraints Remove old and unused constraints environments from tox.ini. Those have never been used. Use standard environments as default list. Note that the repo has in the past not used constraints in OpenStack CI, this change keeps the status quo. For more information about constraints see: http://lists.openstack.org/pipermail/openstack-dev/2016-August/101474.html Change-Id: I1b9b6d893a80608a4b0783807f565883449be1b2 --- tox.ini | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/tox.ini b/tox.ini index d4cd6e3..08ce02a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,56 +1,31 @@ [tox] minversion = 2.0 -envlist = py34-constraints,py27-constraints,pypy-constraints,pep8-constraints +envlist = py34,py27,pypy,pep8 skipsdist = True [testenv] usedevelop = True -install_command = - constraints: {[testenv:common-constraints]install_command} - pip install -U {opts} {packages} +install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt commands = python setup.py test --slowest --testr-args='{posargs}' -[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:pep8] commands = flake8 {posargs} -[testenv:pep8-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = flake8 {posargs} - [testenv:venv] commands = {posargs} -[testenv:venv-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = {posargs} - [testenv:cover] commands = python setup.py test --coverage --testr-args='{posargs}' -[testenv:cover-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = python setup.py test --coverage --testr-args='{posargs}' - [testenv:docs] commands = python setup.py build_sphinx -[testenv:docs-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = python setup.py build_sphinx - [testenv:debug] commands = oslo_debug_helper {posargs} -[testenv:debug-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = oslo_debug_helper {posargs} - [flake8] # E123, E125 skipped as they are invalid PEP-8.