From efe18cbfeb298a85feadfdad4df6e46355d4a799 Mon Sep 17 00:00:00 2001
From: Witold Bedyk <witold.bedyk@est.fujitsu.com>
Date: Fri, 9 Feb 2018 15:46:45 +0100
Subject: [PATCH] Clean up tox.ini

Depends-On: https://review.openstack.org/545832
Change-Id: I676ba1fbe4f0219f8b6dcd97c087f59b318c500d
---
 tools/tox_install.sh | 57 --------------------------------------------
 tox.ini              | 12 +++++-----
 2 files changed, 6 insertions(+), 63 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 6e36bf9b..00000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-# Constraint file contains this package version pin that is in conflict
-# with installing the package from source. We should replace the version pin in
-# the constraints file before applying it for from-source installation.
-
-ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-BRANCH_NAME=master
-PACKAGE_NAME=monasca-persister
-requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
-
-set -e
-
-git config --global url.https://git.openstack.org/.insteadOf git://git.openstack.org/
-
-CONSTRAINTS_FILE=$1
-shift
-
-install_cmd="pip install"
-mydir=$(mktemp -dt "$PACKAGE_NAME-tox_install-XXXXXXX")
-trap "rm -rf $mydir" EXIT
-localfile=$mydir/upper-constraints.txt
-if [[ $CONSTRAINTS_FILE != http* ]]; then
-    CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-fi
-curl $CONSTRAINTS_FILE -k -o $localfile
-install_cmd="$install_cmd -c$localfile"
-
-if [ $requirements_installed -eq 0 ]; then
-    echo "ALREADY INSTALLED" > /tmp/tox_install.txt
-    echo "Requirements already installed; using existing package"
-elif [ -x "$ZUUL_CLONER" ]; then
-    echo "ZUUL CLONER" > /tmp/tox_install.txt
-    pushd $mydir
-    $ZUUL_CLONER --cache-dir \
-        /opt/git \
-        --branch $BRANCH_NAME \
-        git://git.openstack.org \
-        openstack/requirements
-    cd openstack/requirements
-    $install_cmd -e .
-    popd
-else
-    echo "PIP HARDCODE" > /tmp/tox_install.txt
-    if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then
-        REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements"
-    fi
-    $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
-fi
-
-# 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 -- $PACKAGE_NAME "-e file://$PWD#egg=$PACKAGE_NAME"
-
-$install_cmd -U $*
-exit $?
diff --git a/tox.ini b/tox.ini
index 3bc58fe5..e3434035 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,6 @@ skipsdist = True
 setenv =
     VIRTUAL_ENV={envdir}
     DISCOVER_DIRECTORY=tests
-    CLIENT_NAME=monasca-persister
 passenv = http_proxy
           HTTP_PROXY
           https_proxy
@@ -18,11 +17,12 @@ usedevelop = True
 whitelist_externals = bash
                       find
                       rm
-install_command =
-    {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps = .[influxdb,cassandra,elasticsearch]
-       -r{toxinidir}/requirements.txt
-       -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}
+  .[influxdb,cassandra,elasticsearch]
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
 commands =
   find {toxinidir} -type f -name "*.py[c|o]" -delete
   rm -Rf .testrepository/times.dbm