Avoid tox-install.sh
Instead of using tox-install.sh, we can install horizon 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. Use new location for constraints file. Change-Id: Iabdad92e19b57b82ced7ae20043a08d174995305
This commit is contained in:
parent
a070e6c197
commit
60acb5cfbb
|
@ -14,3 +14,4 @@ Django<2.1,>=1.11;python_version>='3.0' # BSD
|
||||||
django-babel>=0.6.2 # BSD
|
django-babel>=0.6.2 # BSD
|
||||||
django-compressor>=2.0 # MIT
|
django-compressor>=2.0 # MIT
|
||||||
django-pyscss>=2.0.2 # BSD License (2 clause)
|
django-pyscss>=2.0.2 # BSD License (2 clause)
|
||||||
|
horizon # Apache-2.0
|
||||||
|
|
|
@ -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 $?
|
|
4
tox.ini
4
tox.ini
|
@ -8,8 +8,8 @@ usedevelop = True
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
BRANCH_NAME=master
|
BRANCH_NAME=master
|
||||||
CLIENT_NAME=iotronic-ui
|
CLIENT_NAME=iotronic-ui
|
||||||
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}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = {}
|
commands = {}
|
||||||
whitelist_externals = flake8
|
whitelist_externals = flake8
|
||||||
|
|
Loading…
Reference in New Issue