summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-02 12:52:52 +0000
committerGerrit Code Review <review@openstack.org>2016-08-02 12:52:52 +0000
commit2f8253a03a4a82ca01748a46d7ab913587da55cd (patch)
tree9d04f078b8261776f4223c8221357c8ed12fdb83
parent387049f51f9f516fa853d3514513002f87d1f0db (diff)
parent12e31c8a263a9272cd58ab110940460a7d356afe (diff)
downloadheat-2f8253a03a4a82ca01748a46d7ab913587da55cd.tar.gz
Merge "Always use upper-constraints" into stable/mitaka
-rw-r--r--tox.ini8
1 files changed, 7 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 53c657b64..be1b1f950 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/mitaka} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
@@ -40,9 +40,13 @@ commands =
python tools/custom_guidelines.py --exclude heat/engine/resources/aws
[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}'
@@ -73,4 +77,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