From af870b8858e7d53c6b51471d6647d30861d1ad3f Mon Sep 17 00:00:00 2001
From: Wajdi Al-Hawari <walhawari@iweb.com>
Date: Fri, 2 Sep 2016 14:49:15 -0400
Subject: [PATCH] Adding Updated Tox

This is to be inline with the new upstream cookiecutter project udpates
Ref:
https://github.com/openstack-dev/cookiecutter/commit/2cf26bf0a326cb9a837a369206ac3b1d674a15c2
---
 tox.ini | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/tox.ini b/tox.ini
index 4720310..682af18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,64 +1,34 @@
 [tox]
 minversion = 2.0
-envlist = py34-constraints,py27-constraints,pep8-constraints
+envlist = py34,py27,pep8
 skipsdist = True
 
-[tox:travis]
-2.7 = py27-constraints
-3.4 = py34-constraints
-
 [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}
+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:releasenotes]
-commands =
-  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-
-[testenv:docs-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = python setup.py build_sphinx
+commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [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.