From 6b03d1c7b0bfe6da011e137a6002bb3d483adb32 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 26 Aug 2016 16:57:15 +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: I124befdfe53313ee36ff196a068a7958cfec957a
---
 tox.ini | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/tox.ini b/tox.ini
index 9fd5faa..89d14ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,60 +1,35 @@
 [tox]
 minversion = 1.8
-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.
 
 show-source = True
 ignore = E123,E125
 builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
\ No newline at end of file
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build