From c9eb004689dfdb60ef59a655781d4c7a94361358 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 7 Mar 2018 20:42:40 +0100
Subject: [PATCH] Avoid tools/tox_install

We do not need to install neutron anymore, this repo only uses
neutron-lib.

Remove tools/tox_install.sh and adjust tox.ini for using it.

Change-Id: I3a91fc221f2103a66f20ff2387974c88f8bd8a23
---
 tools/tox_install.sh | 52 --------------------------------------------
 tox.ini              |  9 ++++----
 2 files changed, 5 insertions(+), 56 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 2f40c28..0000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# Many of neutron's repos suffer from the problem of depending on neutron,
-# but it not existing on pypi.
-
-# 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.
-
-# From the tox.ini config page:
-# install_command=ARGV
-# default:
-# pip install {opts} {packages}
-
-set -x
-
-ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?)
-NEUTRON_DIR=$HOME/neutron
-BRANCH_NAME=master
-
-set -e
-
-install_cmd="pip install -c$1"
-shift
-
-if [ -d "$NEUTRON_DIR" ]; then
-    echo "FOUND Neutron code at $NEUTRON_DIR - using"
-    $install_cmd -U -e $NEUTRON_DIR
-elif [ $neutron_installed -eq 0 ]; then
-    location=$(python -c "import neutron; print(neutron.__file__)")
-    echo "ALREADY INSTALLED at $location"
-elif [ -x "$ZUUL_CLONER" ]; then
-    echo "USING ZUUL CLONER to obtain Neutron code"
-    cwd=$(/bin/pwd)
-    cd /tmp
-    $ZUUL_CLONER --cache-dir \
-        /opt/git \
-        --branch $BRANCH_NAME \
-        git://git.openstack.org \
-        openstack/neutron
-    cd openstack/neutron
-    $install_cmd -e .
-    cd "$cwd"
-else
-    echo "LOCAL - Obtaining Neutron code from git.openstack.org"
-    $install_cmd -U -egit+https://git.openstack.org/openstack/neutron@$BRANCH_NAME#egg=neutron
-fi
-
-$install_cmd -U $*
-exit $?
diff --git a/tox.ini b/tox.ini
index f683360..468cdcc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,12 +5,13 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-#install_command = pip install -U {opts} {packages}
-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  {opts} {packages}
 setenv =
-   VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
-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
 whitelist_externals = rm
 commands =
     rm -f .testrepository/times.dbm