From cc0af490cfb04452fb82ae10df517ae16acda58e Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 14 Mar 2018 21:08:44 +0100
Subject: [PATCH] Avoid tox-install.sh

Instead of using tox-install.sh, we can install horizon and neutron
now directly from pypi - or use the current branch in CI system using
tox-siblings.

Update tox.ini for this change and add horizon to requirements file.

Change-Id: Ife02518fce62083661bf06c0fb98e683c5c3d311
---
 requirements.txt     |  1 +
 tools/tox_install.sh | 64 --------------------------------------------
 tox.ini              | 12 +++------
 3 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100755 tools/tox_install.sh

diff --git a/requirements.txt b/requirements.txt
index c4bf0083..ae2333a1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@
 oslo.log>=3.36.0 # Apache-2.0
 python-monascaclient>=1.7.0 # Apache-2.0
 Django<2.0,>=1.8 # BSD
+horizon>=13.0.0  # Apache-2.0
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 3a38ee47..00000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# Many of horizon's repos suffer from the problem of depending on horizon,
-# 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 horizon 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}
-
-ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-GIT_BASE=${GIT_BASE:-https://git.openstack.org/}
-
-install_project() {
-    local project=$1
-    local branch=${2:-$BRANCH_NAME}
-    local module_name=${project//-/_}
-
-    set +e
-    project_installed=$(echo "import $module_name" | python 2>/dev/null ; echo $?)
-    set -e
-
-    if [ $project_installed -eq 0 ]; then
-        echo "ALREADY INSTALLED" > /tmp/tox_install.txt
-        echo "$project already installed; using existing package"
-    elif [ -x "$ZUUL_CLONER" ]; then
-        echo "ZUUL CLONER" > /tmp/tox_install.txt
-        # Make this relative to current working directory so that
-        # git clean can remove it. We cannot remove the directory directly
-        # since it is referenced after $install_cmd -e
-        mkdir -p .tmp
-        PROJECT_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)
-        pushd $PROJECT_DIR
-        $ZUUL_CLONER --cache-dir \
-            /opt/git \
-            --branch $branch \
-            http://git.openstack.org \
-            openstack/$project
-        cd openstack/$project
-        $install_cmd -e .
-        popd
-    else
-        echo "PIP HARDCODE" > /tmp/tox_install.txt
-        local GIT_REPO="$GIT_BASE/openstack/$project"
-        SRC_DIR="$VIRTUAL_ENV/src/$project"
-        git clone --depth 1 --branch $branch $GIT_REPO $SRC_DIR
-        $install_cmd -U -e $SRC_DIR
-    fi
-}
-
-set -e
-
-install_cmd="pip install -c$1"
-shift
-
-install_project horizon
-
-$install_cmd -U $*
-exit $?
diff --git a/tox.ini b/tox.ini
index 350ddd11..ef0100ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,21 +5,16 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-setenv =
-    VIRTUAL_ENV={envdir}
-    BRANCH_NAME=master
-    CLIENT_NAME=monasca-ui
 passenv =  http_proxy
            HTTP_PROXY
            https_proxy
            HTTPS_PROXY
            no_proxy
            NO_PROXY
-deps = -r{toxinidir}/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
-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}
 
 whitelist_externals =
     /bin/bash
@@ -30,7 +25,6 @@ commands =
 
 [testenv:py27]
 setenv =
-   {[testenv]setenv}
    DJANGO_SETTINGS_MODULE=monitoring.test.settings
 
 [testenv:pep8]