Avoid tox_install.sh for constraints support

I created a tox PR[1] to add native support for constraints.  The answer
was basically "use deps".

I tested it locally with shade and tox and it does indeed seem to do
what we want.  Use shade as a guinea pig before rolling this out wider.

[1] https://github.com/tox-dev/tox/pull/642

Change-Id: I450dd513d7e1f881db764b11dcd6f9072c0c369c
Depends-On: Id61ae52d48b28cfc2221cb556a1c1f7c6dfd60dd

playbooks/devstack/pre.yaml

@@ -6,5 +6,3 @@
       bindep_dir: "{{ zuul_work_dir }}"
     - test-setup
     - ensure-tox
-    - role: tox-siblings
-      when: tox_install_siblings

tools/tox_install.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE=$1
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ $CONSTRAINTS_FILE != http* ]]; then
-    CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
-
-pip install -c$localfile openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints $localfile -- $CLIENT_NAME
-
-pip install -c$localfile -U $*
-exit $?

tox.ini

@@ -6,15 +6,16 @@ skipsdist = True
 [testenv]
 usedevelop = True
 passenv = UPPER_CONSTRAINTS_FILE
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     LANG=en_US.UTF-8
     LANGUAGE=en_US:en
     LC_ALL=C
-    BRANCH_NAME=master
-    CLIENT_NAME=shade
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
            stestr slowest