From 20b78f6c781b1607da4a3eced1f8b6da5320cf90 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 26 Aug 2016 16:39:10 +0200
Subject: [PATCH] Cleanup tox.ini, enable constraints

Remove old and unused constraints environments from tox.ini. Those
have never been used. Use standard environments as default list.

Enable use of constraints for all jobs now.

For more about constraints see:
http://lists.openstack.org/pipermail/openstack-dev/2016-August/101474.html

Change-Id: I9b4c567e8bcf4abd52e1d499f7ec0b22b034c815
---
 tox.ini | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/tox.ini b/tox.ini
index 771c126..82a6113 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,63 +1,34 @@
 [tox]
 minversion = 1.8
-envlist = pep8,pep8-constraints,py27,py34
+envlist = pep8,py27,py34
 skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command =
-                  constraints: {[testenv:common-constraints]install_command}
-                  pip install -U {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --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:linters]
 commands = flake8 {posargs}
 
-[testenv:linters-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = flake8 {posargs}
-
 [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 testr --coverage --testr-args='{posargs}'
 
-[testenv:cover-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = python setup.py testr --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]
 show-source = True
 builtins = _