From cb83dbd16ceefcf686afef9c5562404ad435519d Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 2 Dec 2017 09:33:14 +0100
Subject: [PATCH] Avoid tox_install.sh for constraints support

We do not need tox_install.sh, pip can handle constraints itself
and install the project correctly. Thus update tox.ini and remove
the now obsolete tools/tox_install.sh file.

This follows https://review.openstack.org/#/c/508061 to remove
tools/tox_install.sh.

Change-Id: I7f06c0be47f57a9c1ee3cadc7328b1b1b138b3cd
(cherry picked from commit aede01a0a8d21d49fc4a811650b5ae5bdcb17adc)
---
 tools/tox_install.sh | 30 ------------------------------
 tox.ini              | 13 +++++--------
 2 files changed, 5 insertions(+), 38 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 43468e450..000000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -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 $?
diff --git a/tox.ini b/tox.ini
index 2dbedcf25..664685294 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,12 +11,11 @@ whitelist_externals = find
                     bash
 passenv = ZUUL_CACHE_DIR
           REQUIREMENTS_PIP_LOCATION
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
-setenv = VIRTUAL_ENV={envdir}
-         BRANCH_NAME=master
-         CLIENT_NAME=python-novaclient
-
-deps = -r{toxinidir}/test-requirements.txt
+install_command = pip install {opts} {packages}
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike}
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
   bash tools/pretty_tox.sh '{posargs}'
@@ -44,7 +43,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 basepython = python2.7
 passenv = OS_NOVACLIENT_TEST_NETWORK
 setenv =
-  {[testenv]setenv}
   OS_TEST_PATH = ./novaclient/tests/functional
 commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}'
 
@@ -52,7 +50,6 @@ commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}'
 basepython = python3.5
 passenv = OS_NOVACLIENT_TEST_NETWORK
 setenv =
-  {[testenv]setenv}
   OS_TEST_PATH = ./novaclient/tests/functional
 commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}'