From 0d3ca9c29a324f06a4b4dacc62a64aa38f1a67b8 Mon Sep 17 00:00:00 2001
From: Amrith Kumar <amrith@tesora.com>
Date: Thu, 11 Aug 2016 14:45:31 -0400
Subject: [PATCH] Constraints are ready to be used for tox.ini

Per email[1] from Andreas, we don't need to hack at install_command
any longer.

[1] http://openstack.markmail.org/thread/a4l7tokbotwqvuoh

Change-Id: Ibb642f76d92cb56e1764e0460822a57f68931263
---
 tox.ini | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/tox.ini b/tox.ini
index 01be3fec3b..4e41769f84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,12 +47,6 @@ commands =
 
 
 [testenv:venv]
-# NOTE(amrith) The setting of the install_command in this location
-# is only required because currently infra does not actually
-# support constraints files for the venv job, and while
-# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
-# no file there. It can be removed when infra changes this.
-install_command = pip install -U {opts} {packages}
 commands = {posargs}
 
 [flake8]
@@ -68,40 +62,18 @@ filename=*.py,trove-*
 commands = openstack-doc-test --check-links {posargs}
 
 [testenv:checkbuild]
-# NOTE(pmalik) The setting of the install_command in this location
-# is only required because currently infra does not actually
-# support constraints files for the publishdocs job, and while
-# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
-# no file there. It can be removed when infra changes this.
-install_command = pip install -U {opts} {packages}
 commands =
   openstack-doc-test --check-niceness --check-syntax --check-deletions {posargs}
   openstack-doc-test --check-build {posargs}
 
 [testenv:publishdocs]
-# NOTE(amrith) The setting of the install_command in this location
-# is only required because currently infra does not actually
-# support constraints files for the publishdocs job, and while
-# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
-# no file there. It can be removed when infra changes this.
-install_command = pip install -U {opts} {packages}
 commands = openstack-doc-test --check-build --publish --force
 
 [testenv:releasenotes]
-# NOTE(amrith) The setting of the install_command in this location
-# is only required because currently infra does not actually
-# support constraints files for the release notes job, and while
-# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
-# no file there. It can be removed when infra changes this.
-install_command = pip install -U {opts} {packages}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:bandit]
 commands = bandit -r trove -n5 -x tests
 
 [testenv:install-guide]
-# NOTE(jaegerandi): this target does not use constraints because
-# upstream infra does not yet support it. Once that's fixed, we can
-# drop the install_command.
-install_command = pip install -U --force-reinstall {opts} {packages}
 commands = sphinx-build -a -E -W -d install-guide/build/doctrees -b html install-guide/source install-guide/build/html