From 0525d287672589f9edad7a9c93dbf2d79375505e Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 14 Mar 2018 21:04:06 +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: I898fb222f5b36714c61e60c222e8b57ddea99df6
---
 requirements.txt      |  4 +++
 test-requirements.txt |  2 --
 tools/tox_install.sh  | 65 -------------------------------------------
 tox.ini               | 12 ++++----
 4 files changed, 10 insertions(+), 73 deletions(-)
 delete mode 100755 tools/tox_install.sh

diff --git a/requirements.txt b/requirements.txt
index 450f3f90..570ec360 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,7 @@
 # PBR should always appear first
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 python-heatclient>=1.10.0 # Apache-2.0
+
+# This will be installed from git in OpenStack CI if the job setting
+# required-projects for horizon:
+horizon>=13.0.0  # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index fd815534..8842a878 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -22,5 +22,3 @@ nosehtmloutput>=0.0.3 # Apache-2.0
 nosexcover>=1.0.10 # BSD
 openstack.nose-plugin>=0.7 # Apache-2.0
 testtools>=2.2.0 # MIT
-# This also needs xvfb library installed on your OS
-http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index ebb83154..00000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,65 +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
-BRANCH_NAME=master
-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 9b703fe8..c073f667 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,9 +5,6 @@ skipsdist = True
 
 [testenv]
 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}
 setenv =
   VIRTUAL_ENV={envdir}
   INTEGRATION_TESTS=0
@@ -16,7 +13,8 @@ setenv =
   NOSE_OPENSTACK_RED=0.05
   NOSE_OPENSTACK_YELLOW=0.025
   NOSE_OPENSTACK_SHOW_ELAPSED=1
-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
 commands =
   py27: {[unit_tests]commands}
@@ -91,11 +89,13 @@ commands =
   {[unit_tests]commands}
 
 [testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -r{toxinidir}/doc/requirements.txt
 commands = python setup.py build_sphinx
 
 [testenv:releasenotes]
-deps = -r{toxinidir}/doc/requirements.txt
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [hacking]