From c8a0f9b6b4d99f01a9e4886da778d157e968a8ca Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 26 Aug 2016 10:45:19 +0200 Subject: [PATCH] Cleanup tox.ini constraints Remove old constraint setup, these environments are completely unused. way. Note that the repo did not use constraints before - and does not use them now since the repo is not part of global requirements process. Change-Id: I676a6b7199a6c4db0b3420c38ff536acbd02b436 --- tox.ini | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/tox.ini b/tox.ini index 01110904d..dde725a7a 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} - [testenv:releasenotes] commands = rm -rf releasenotes/build