Fix lower-constraint deps handling
When the lower-constraints tox target was added, it was assumed the install_command was just running the install and that the dependencies and constraints were being set using "deps = ". This fixed the install_command and deps to follow the expected pattern so the lower-constraints job actual does install the lower constraints. Raises the minimum for keystonemiddleware as the one listed was too low for some of the changes merged to the code. Change-Id: Ibbdc2d98272ceb65433818d8ba41ce3bfacd4443 Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
parent
af6d813f84
commit
983cd1e9bb
@ -46,7 +46,7 @@ jmespath==0.9.3
|
||||
jsonpointer==2.0
|
||||
jsonschema==2.6.0
|
||||
keystoneauth1==3.4.0
|
||||
keystonemiddleware==4.17.0
|
||||
keystonemiddleware==4.18.0
|
||||
kombu==4.1.0
|
||||
linecache2==1.0.0
|
||||
logutils==0.3.5
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
PyYAML>=3.12 # MIT
|
||||
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
|
||||
keystonemiddleware>=4.17.0 # Apache-2.0
|
||||
keystonemiddleware>=4.18.0 # Apache-2.0
|
||||
pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
|
||||
psutil>=3.2.2 # BSD
|
||||
python-etcd>=0.4.3 # MIT License
|
||||
|
5
tox.ini
5
tox.ini
@ -5,7 +5,7 @@ skipsdist = True
|
||||
|
||||
[testenv]
|
||||
usedevelop = True
|
||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||
install_command = pip install {opts} {packages}
|
||||
whitelist_externals = bash
|
||||
find
|
||||
rm
|
||||
@ -13,7 +13,8 @@ setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
PYTHONWARNINGS=default::DeprecationWarning
|
||||
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
commands =
|
||||
|
Loading…
x
Reference in New Issue
Block a user