make trove-dashboard use upper-constraints
Currently trove-dashboard installs (explicitly) unconstrained. Change to be constrained by modifying pip_install to only support a constrained option. Change-Id: I6fcb5a90290faba1b64e7d1bf2b74087a0c759cd Closes-Bug: #1623932
This commit is contained in:
parent
ae3479f8e1
commit
e0011ccdb9
@ -21,11 +21,7 @@ horizon_installed=$(echo "import horizon" | python 2>/dev/null ; echo $?)
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
install_cmd="pip install"
|
install_cmd="pip install $1"
|
||||||
if [ "$1" = "constrained" ]; then
|
|
||||||
install_cmd="$install_cmd $2"
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
shift
|
shift
|
||||||
|
|
||||||
if [ $horizon_installed -eq 0 ]; then
|
if [ $horizon_installed -eq 0 ]; then
|
||||||
|
8
tox.ini
8
tox.ini
@ -5,7 +5,9 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = {toxinidir}/tools/pip_install.sh unconstrained {opts} {packages}
|
install_command = {toxinidir}/tools/pip_install.sh \
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \
|
||||||
|
{opts} {packages}
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
@ -20,7 +22,9 @@ commands = flake8
|
|||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
# This target does not use script since we do not need to install horizon.
|
# This target does not use script since we do not need to install horizon.
|
||||||
install_command = pip install -U --force-reinstall {opts} {packages}
|
install_command = pip install \
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \
|
||||||
|
-U --force-reinstall {opts} {packages}
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
# Django-1.8 is LTS
|
# Django-1.8 is LTS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user