From c25ece63bd8eefac4520d98ed7469ee446f4f59c Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Mon, 4 Apr 2016 11:41:05 +0200
Subject: [PATCH] Cleaned up tox_install.sh

Now that we don't need the script to pull tempest from git, it became
redundant. It's better to clean it up.

Change-Id: I8881840813339c20e4d5c59b98c2eff63f4feffb
---
 tools/tox_install.sh | 23 -----------------------
 tox.ini              |  8 ++++----
 2 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100755 tools/tox_install.sh

diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 32145ed28e8..00000000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Many of neutron's repos suffer from the problem of depending on neutron,
-# but it not existing on pypi. -- Well, that's the usual issue, but in
-# neutron's case, we want to import tempest directly for the api tests.
-
-# This wrapper for tox's package installer will use the existing package
-# if it exists, else use zuul-cloner if that program exists, else grab it
-# from neutron master via a hard-coded URL. That last case should only
-# happen with devs running unit tests locally.
-
-set -eux
-
-install_cmd="pip install"
-
-CONSTRAINTS_FILE=$1
-shift
-
-if [ "$CONSTRAINTS_FILE" != "unconstrained" ]; then
-    install_cmd="$install_cmd -c$CONSTRAINTS_FILE"
-fi
-
-$install_cmd -U $*
diff --git a/tox.ini b/tox.ini
index 9869cada393..56f00193a10 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 usedevelop = True
 install_command =
-    {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+    pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh
@@ -90,7 +90,7 @@ deps =
 
 [testenv:releasenotes]
 # TODO(ihrachys): remove once infra supports constraints for this target
-install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages}
+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:pep8]
@@ -112,7 +112,7 @@ whitelist_externals =
 
 [testenv:cover]
 # TODO(ihrachys): remove once infra supports constraints for this target
-install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages}
+install_command = pip install -U {opts} {packages}
 basepython = python2.7
 commands =
   python setup.py testr --coverage --testr-args='{posargs}'
@@ -120,7 +120,7 @@ commands =
 
 [testenv:venv]
 # TODO(ihrachys): remove once infra supports constraints for this target
-install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages}
+install_command = pip install -U {opts} {packages}
 commands = {posargs}
 
 [testenv:docs]