Fix upper and lower constraints
- Mistral has some newer lower requirements.
- Adds the upper contraints file in the 'deps' tox attribute.
- Removes 'VIRTUAL_ENV' environment variable, which is useless here.
Co-Authored-By: Alex Schultz <aschultz@redhat.com>
Co-Authored-By: Daniel Bengtsson <dbengt@redhat.com>
Co-Authored-By: Hervé Beraud <hberaud@redhat.com>
Co-Authored-By: Cédric Jeanneret <cjeanner@redhat.com>
Change-Id: Ia0c67c5980a7e6bc9006a24be775ea6fb815d23c
(cherry picked from commit 9b69f08a6f
)
This commit is contained in:
parent
65545f3e4d
commit
d74065fd03
|
@ -14,7 +14,7 @@ cmd2==0.8.1
|
||||||
coverage==4.0
|
coverage==4.0
|
||||||
cryptography==2.1.4
|
cryptography==2.1.4
|
||||||
debtcollector==1.19.0
|
debtcollector==1.19.0
|
||||||
decorator==4.2.1
|
decorator==4.3.0
|
||||||
deprecation==2.0
|
deprecation==2.0
|
||||||
docker-pycreds==0.2.2
|
docker-pycreds==0.2.2
|
||||||
docker==3.1.1
|
docker==3.1.1
|
||||||
|
@ -39,11 +39,11 @@ jmespath==0.9.3
|
||||||
jsonpatch==1.21
|
jsonpatch==1.21
|
||||||
jsonpointer==2.0
|
jsonpointer==2.0
|
||||||
jsonschema==2.6.0
|
jsonschema==2.6.0
|
||||||
keystoneauth1==3.4.0
|
keystoneauth1==3.12.0
|
||||||
linecache2==1.0.0
|
linecache2==1.0.0
|
||||||
MarkupSafe==1.0
|
MarkupSafe==1.0
|
||||||
mccabe==0.2.1
|
mccabe==0.2.1
|
||||||
mistral-lib==0.4.0
|
mistral-lib==1.2.0
|
||||||
mock==2.0.0
|
mock==2.0.0
|
||||||
monotonic==1.4
|
monotonic==1.4
|
||||||
mox3==0.25.0
|
mox3==0.25.0
|
||||||
|
@ -52,23 +52,23 @@ munch==2.2.0
|
||||||
netaddr==0.7.18
|
netaddr==0.7.18
|
||||||
netifaces==0.10.6
|
netifaces==0.10.6
|
||||||
openstackdocstheme==1.20.0
|
openstackdocstheme==1.20.0
|
||||||
openstacksdk==0.12.0
|
openstacksdk==0.24.0
|
||||||
os-client-config==1.29.0
|
os-client-config==1.29.0
|
||||||
os-net-config==7.1.0
|
os-net-config==7.1.0
|
||||||
os-service-types==1.2.0
|
os-service-types==1.2.0
|
||||||
osc-lib==1.10.0
|
osc-lib==1.14.0
|
||||||
oslo.concurrency==3.26.0
|
oslo.concurrency==3.26.0
|
||||||
oslo.config==5.2.0
|
oslo.config==5.2.0
|
||||||
oslo.context==2.20.0
|
oslo.context==2.22.0
|
||||||
oslo.i18n==3.20.0
|
oslo.i18n==3.20.0
|
||||||
oslo.log==3.37.0
|
oslo.log==3.37.0
|
||||||
oslo.serialization==2.25.0
|
oslo.serialization==2.25.0
|
||||||
oslo.utils==3.36.0
|
oslo.utils==3.40.2
|
||||||
oslotest==3.2.0
|
oslotest==3.2.0
|
||||||
packaging==17.1
|
packaging==17.1
|
||||||
paramiko==2.4.1
|
paramiko==2.4.1
|
||||||
passlib==1.7.1
|
passlib==1.7.1
|
||||||
pbr==2.0.0
|
pbr==3.1.1
|
||||||
pep8==1.5.7
|
pep8==1.5.7
|
||||||
prettytable==0.7.2
|
prettytable==0.7.2
|
||||||
pyasn1==0.4.2
|
pyasn1==0.4.2
|
||||||
|
@ -84,11 +84,11 @@ python-dateutil==2.7.0
|
||||||
python-glanceclient==2.9.1
|
python-glanceclient==2.9.1
|
||||||
python-heatclient==1.10.0
|
python-heatclient==1.10.0
|
||||||
python-ironic-inspector-client==3.1.1
|
python-ironic-inspector-client==3.1.1
|
||||||
python-ironicclient==2.3.0
|
python-ironicclient==2.7.0
|
||||||
python-keystoneclient==3.15.0
|
python-keystoneclient==3.20.0
|
||||||
python-mimeparse==1.6.0
|
python-mimeparse==1.6.0
|
||||||
python-mistralclient==3.1.0
|
python-mistralclient==3.1.0
|
||||||
python-novaclient==9.1.0
|
python-novaclient==15.0.0
|
||||||
python-subunit==1.0.0
|
python-subunit==1.0.0
|
||||||
python-swiftclient==3.5.0
|
python-swiftclient==3.5.0
|
||||||
python-zaqarclient==1.9.0
|
python-zaqarclient==1.9.0
|
||||||
|
@ -99,13 +99,13 @@ requests==2.18.4
|
||||||
requestsexceptions==1.4.0
|
requestsexceptions==1.4.0
|
||||||
rfc3986==1.1.0
|
rfc3986==1.1.0
|
||||||
simplejson==3.13.2
|
simplejson==3.13.2
|
||||||
six==1.10.0
|
six==1.11.0
|
||||||
smmap2==2.0.3
|
smmap2==2.0.3
|
||||||
snowballstemmer==1.2.1
|
snowballstemmer==1.2.1
|
||||||
Sphinx==1.6.2
|
Sphinx==1.6.2
|
||||||
sphinxcontrib-websupport==1.0.1
|
sphinxcontrib-websupport==1.0.1
|
||||||
stevedore==1.28.0
|
stevedore==1.28.0
|
||||||
tenacity==4.9.0
|
tenacity==5.0.1
|
||||||
testrepository==0.0.18
|
testrepository==0.0.18
|
||||||
testscenarios==0.4
|
testscenarios==0.4
|
||||||
testtools==2.2.0
|
testtools==2.2.0
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr>=3.1.1 # Apache-2.0
|
||||||
oslo.config>=5.2.0 # Apache-2.0
|
oslo.config>=5.2.0 # Apache-2.0
|
||||||
keystoneauth1>=3.4.0 # Apache-2.0
|
keystoneauth1>=3.12.0 # Apache-2.0
|
||||||
python-novaclient>=9.1.0 # Apache-2.0
|
python-novaclient>=15.0.0 # Apache-2.0
|
||||||
python-heatclient>=1.10.0 # Apache-2.0
|
python-heatclient>=1.10.0 # Apache-2.0
|
||||||
python-glanceclient>=2.9.1 # Apache-2.0
|
python-glanceclient>=2.9.1 # Apache-2.0
|
||||||
python-ironicclient>=2.3.0 # Apache-2.0
|
python-ironicclient>=2.7.0 # Apache-2.0
|
||||||
python-ironic-inspector-client>=3.1.1 # Apache-2.0
|
python-ironic-inspector-client>=3.1.1 # Apache-2.0
|
||||||
os-net-config>=7.1.0 # Apache-2.0
|
os-net-config>=7.1.0 # Apache-2.0
|
||||||
oslo.utils>=3.36.0 # Apache-2.0
|
oslo.utils>=3.40.2 # Apache-2.0
|
||||||
six>=1.10.0 # MIT
|
six>=1.11.0 # MIT
|
||||||
tripleo-common>=7.1.0 # Apache-2.0
|
tripleo-common>=7.1.0 # Apache-2.0
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -6,7 +6,6 @@ skipdist = True
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
basepython = python3
|
basepython = python3
|
||||||
install_command = pip install {opts} {packages}
|
|
||||||
passenv = *
|
passenv = *
|
||||||
setenv =
|
setenv =
|
||||||
ANSIBLE_CALLBACK_PLUGINS={toxinidir}/callback_plugins
|
ANSIBLE_CALLBACK_PLUGINS={toxinidir}/callback_plugins
|
||||||
|
@ -24,6 +23,7 @@ setenv =
|
||||||
commands = python setup.py test --slowest --testr-args='{posargs}'
|
commands = python setup.py test --slowest --testr-args='{posargs}'
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
deps =
|
deps =
|
||||||
|
-c {env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
|
||||||
-r {toxinidir}/requirements.txt
|
-r {toxinidir}/requirements.txt
|
||||||
-r {toxinidir}/test-requirements.txt
|
-r {toxinidir}/test-requirements.txt
|
||||||
-r {toxinidir}/molecule-requirements.txt
|
-r {toxinidir}/molecule-requirements.txt
|
||||||
|
|
Loading…
Reference in New Issue