Fix lower-constraints

Resolve a number of conflicts between projects to get the
lower-constraints job passing again.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Change-Id: Id23e7692bc6f20cbcc989d68fd717c93425a38a5
This commit is contained in:
Stephen Finucane 2021-07-13 16:19:22 +01:00
parent e6edaee892
commit c52b7cf327
2 changed files with 6 additions and 12 deletions

View File

@ -15,9 +15,7 @@ dulwich==0.15.0
extras==1.0.0
fasteners==0.7.0
fixtures==3.0.0
flake8==2.5.5
future==0.16.0
hacking==0.12.0
idna==2.6
imagesize==0.7.1
iso8601==0.1.11
@ -26,10 +24,9 @@ jmespath==0.9.0
jsonpatch==1.16
jsonpointer==1.13
jsonschema==2.6.0
keystoneauth1==3.4.0
keystoneauth1==3.11.0
linecache2==1.0.0
MarkupSafe==1.0
mccabe==0.2.1
monotonic==0.6
mox3==0.20.0
msgpack-python==0.4.0
@ -51,13 +48,10 @@ oslo.utils==3.33.0
oslotest==3.2.0
paramiko==2.0.0
pbr==2.0.0
pep8==1.5.7
positional==1.2.1
prettytable==0.7.2
pyasn1==0.1.8
pycparser==2.18
pyflakes==0.8.1
Pygments==2.2.0
pyinotify==0.9.6
pyOpenSSL==17.1.0
pyparsing==2.1.0
@ -72,8 +66,8 @@ python-novaclient==9.1.0
python-openstackclient==3.12.0
python-subunit==1.0.0
python-swiftclient==3.2.0
pytz==2013.6
PyYAML==3.13
pytz==2015.7
PyYAML==5.3.1
requests==2.14.2
requests-mock==1.2.0
requestsexceptions==1.2.0

View File

@ -3,13 +3,13 @@
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
PrettyTable<0.8,>=0.7.2 # BSD
keystoneauth1>=3.4.0 # Apache-2.0
PrettyTable>=0.7.2 # BSD
keystoneauth1>=3.11.0 # Apache-2.0
openstacksdk>=0.24.0 # Apache-2.0
osc-lib>=1.11.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
python-heatclient>=1.10.0 # Apache-2.0
PyYAML>=3.13 # MIT
PyYAML>=5.3.1 # MIT
requests>=2.14.2 # Apache-2.0