Fix constraints URL enforcement for lower-constraints

Due to the upper-constraints argument being hard coded in the
install_command, even jobs like lower-constraints will end up getting
the latest upper-constraints installed.

The correct way to handle the constraints is to separate it out into
deps. This allows the l-c job to properly set what constraints to use.

Fixes some issues with libvirt-python that were masked by these issues.

Change-Id: I0d22d615e2717f12237b8d7b1e4b1071c4497a50
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2019-09-27 14:03:54 -05:00 committed by Radosław Piliszek
parent 8004733630
commit 4bc52ecf15
3 changed files with 6 additions and 4 deletions

View File

@ -33,7 +33,7 @@ jsonpatch==1.21
jsonpointer==2.0
jsonschema==2.6.0
keystoneauth1==3.4.0
libvirt-python==3.5.0
libvirt-python==3.7.0
linecache2==1.0.0
MarkupSafe==1.0
monotonic==1.4

View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
automaton>=1.9.0 # Apache-2.0
libvirt-python!=4.1.0,>=3.5.0 # LGPLv2+
libvirt-python!=4.1.0,!=4.2.0,>=3.7.0 # LGPLv2+
openstacksdk>=0.13.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0

View File

@ -7,12 +7,14 @@ ignore_basepython_conflict = True
[testenv]
basepython = python3
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=./masakarimonitors/tests/unit
LANGUAGE=en_US
LC_ALL=en_US.utf-8
deps = -r{toxinidir}/test-requirements.txt
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = bash
find
rm