From 6e775b82f4a9b82fdf72f82239d0e8d53add6ba2 Mon Sep 17 00:00:00 2001
From: Vladyslav Drok <vdrok@mirantis.com>
Date: Mon, 15 Aug 2016 17:22:18 +0300
Subject: [PATCH] Use upper-constraints for all tox targets

The issue has been resolved by infra [0], so we can use upper
constraints for all targets.

[0]
http://lists.openstack.org/pipermail/openstack-dev/2016-August/101474.html

Change-Id: I5c0378bdc6ddb4f8d0a328f3e61092be6cd579ac
---
 tox.ini | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/tox.ini b/tox.ini
index 89b0bf2bbe..e3102cf622 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,12 +35,6 @@ commands =
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
          LANGUAGE=en_US
-# 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 cover 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 =
   coverage erase
   python setup.py testr --coverage --omit='*test*' --testr-args='{posargs}'
@@ -77,32 +71,16 @@ commands =
 [testenv:api-ref]
 # This environment is called from CI scripts to test and publish
 # the API Ref to developer.openstack.org.
-# NOTE(sdague): this target does not use constraints because
-# upstream infra does not yet support it. Once that's fixed, we can
-# drop the install_command.
 whitelist_externals = bash
-install_command = pip install -U --force-reinstall {opts} {packages}
 commands =
   bash -c 'rm -rf api-ref/build'
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
 
 [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 releasenotes 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:venv]
 setenv = PYTHONHASHSEED=0
-# 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 docs 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]