summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Lynn <xjunlin@cn.ibm.com>2016-07-27 14:07:00 +0800
committerEthan Lynn <xjunlin@cn.ibm.com>2016-08-02 10:58:37 +0800
commitd7861d2a74a173a3c3aeb2a28dc4a7c5832023ad (patch)
tree1a0dd2ea52a06926f1e5fcab80000f3fb7ce68b3
parentd98ed0153d7dcece37c49caba8462c9adc158a09 (diff)
downloadheat-d7861d2a74a173a3c3aeb2a28dc4a7c5832023ad.tar.gz
Always use upper-constraints
This patch modify tox.ini to always use upper-constraints. Change-Id: I113dd658afebe843db304be6cbc4b1ec5df5d248 (cherry picked from commit 2e6ce706956187d4792e1076dd94379b29ba30ef) (cherry picked from commit 12e31c8a263a9272cd58ab110940460a7d356afe)
-rw-r--r--tox.ini8
1 files changed, 7 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 5fe96fd77..4ccf0de5b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
[testenv]
setenv = VIRTUAL_ENV={envdir}
usedevelop = True
-install_command = pip install {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/liberty} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
@@ -39,9 +39,13 @@ commands =
bash -c "find heat -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[testenv:venv]
+# Note: infra doesn't support to use of constraints for this target.
+install_command = pip install -U --force-reinstall {opts} {packages}
commands = {posargs}
[testenv:cover]
+# Note: infra doesn't support to use of constraints for this target.
+install_command = pip install -U --force-reinstall {opts} {packages}
commands =
python setup.py testr --coverage --testr-args='^(?!heat_integrationtests){posargs}'
@@ -83,4 +87,6 @@ import_exceptions = heat.common.i18n
commands = oslo_debug_helper {posargs}
[testenv:releasenotes]
+# Note: infra doesn't support to use of constraints for this target.
+install_command = pip install -U --force-reinstall {opts} {packages}
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html