openstack/nova
Code Issues Proposed changes

Fix lower-constraints conflicts

Browse Source 
Several version specified in our lower-constraints files had conflicting
dependencies. This updates a few packages to avoid those conflicts. It
also removes the linters that are tracked in the global requirements
blocklist since we do not need to enforce lower-constraints for linters.

Change-Id: Iae93f0631d77794f093fd330e849d2fd805b238f
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2020-08-03 10:09:35 -05:00
parent 8ecc29bfcc
commit 274cc3d7f4
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
3 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lower-constraints.txt
View File

@ -1,5 +1,5 @@
alembic==0.9.8
amqp==2.2.2
amqp==2.5.0
appdirs==1.4.3
asn1crypto==0.24.0
attrs==17.4.0
@ -17,23 +17,20 @@ cursive==0.2.1
dataclasses==0.7
ddt==1.2.1
debtcollector==1.19.0
decorator==3.4.0
decorator==4.1.0
deprecation==2.0
dogpile.cache==0.6.5
enum34==1.0.4
enum-compat==0.0.2
eventlet==0.21.0
eventlet==0.22.0
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
flake8==3.6.0
future==0.16.0
futurist==1.8.0
gabbi==1.35.0
gitdb2==2.0.3
GitPython==2.1.8
greenlet==0.4.10
hacking==2.0
idna==2.6
iso8601==0.1.11
Jinja2==2.10
@ -45,12 +42,11 @@ jsonpointer==2.0
jsonschema==3.2.0
keystoneauth1==3.16.0
keystonemiddleware==4.20.0
kombu==4.1.0
kombu==4.6.1
linecache2==1.0.0
lxml==3.4.1
Mako==1.0.7
MarkupSafe==1.0
mccabe==0.6.0
microversion-parse==0.2.1
mock==3.0.0
monotonic==1.4
@ -60,22 +56,22 @@ munch==2.2.0
mypy==0.761
netaddr==0.7.18
netifaces==0.10.4
networkx==1.11
networkx==2.1.0
numpy==1.14.2
openstacksdk==0.35.0
os-brick==3.0.1
os-brick==3.1.0
os-client-config==1.29.0
os-resource-classes==0.4.0
os-service-types==1.7.0
os-traits==2.4.0
os-vif==1.14.0
os-win==3.0.0
os-xenapi==0.3.3
os-win==4.2.0
os-xenapi==0.3.4
osc-lib==1.10.0
oslo.cache==1.26.0
oslo.concurrency==3.29.0
oslo.config==6.1.0
oslo.context==2.21.0
oslo.context==2.22.0
oslo.db==4.44.0
oslo.i18n==3.15.3
oslo.log==3.36.0
@ -110,8 +106,6 @@ pyasn1==0.4.2
pyasn1-modules==0.2.1
pycadf==2.7.0
pycparser==2.18
pyflakes==2.0.0
pycodestyle==2.4.0
pyinotify==0.9.6
pyroute2==0.5.4
PyJWT==1.7.0
@ -126,7 +120,7 @@ python-cinderclient==3.3.0
python-dateutil==2.5.3
python-editor==1.0.3
python-glanceclient==2.8.0
python-ironicclient==2.7.0
python-ironicclient==3.0.0
python-keystoneclient==3.15.0
python-mimeparse==1.6.0
python-neutronclient==6.7.0
@ -141,19 +135,19 @@ retrying==1.3.3
rfc3986==1.1.0
Routes==2.3.1
simplejson==3.13.2
six==1.10.0
six==1.11.0
smmap2==2.0.3
sortedcontainers==2.1.0
SQLAlchemy==1.2.19
sqlalchemy-migrate==0.13.0
sqlparse==0.2.4
statsd==3.2.2
stestr==1.0.0
stestr==2.0.0
stevedore==1.20.0
suds-jurko==0.6
taskflow==2.16.0
taskflow==3.8.0
Tempita==0.5.2
tenacity==4.9.0
tenacity==6.0.0
testrepository==0.0.20
testresources==2.0.0
testscenarios==0.4
@ -164,7 +158,7 @@ unittest2==1.1.0
urllib3==1.22
vine==1.1.4
voluptuous==0.11.1
warlock==1.2.0
warlock==1.3.1
WebOb==1.8.2
websockify==0.9.0
wrapt==1.10.11

16
requirements.txt
View File

@ -4,8 +4,8 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
SQLAlchemy>=1.2.19 # MIT
decorator>=3.4.0 # BSD
eventlet>=0.21.0 # MIT
decorator>=4.1.0 # BSD
eventlet>=0.22.0 # MIT
Jinja2>=2.10 # BSD License (3 clause)
keystonemiddleware>=4.20.0 # Apache-2.0
lxml!=3.7.0,>=3.4.1 # BSD
@ -29,13 +29,13 @@ keystoneauth1>=3.16.0 # Apache-2.0
python-neutronclient>=6.7.0 # Apache-2.0
python-glanceclient>=2.8.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
six>=1.10.0 # MIT
six>=1.11.0 # MIT
stevedore>=1.20.0 # Apache-2.0
websockify>=0.9.0 # LGPLv3
oslo.cache>=1.26.0 # Apache-2.0
oslo.concurrency>=3.29.0 # Apache-2.0
oslo.config>=6.1.0 # Apache-2.0
oslo.context>=2.21.0 # Apache-2.0
oslo.context>=2.22.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.21.1 # Apache-2.0
@ -52,20 +52,20 @@ rfc3986>=1.1.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0
psutil>=3.2.2 # BSD
oslo.versionedobjects>=1.35.0 # Apache-2.0
os-brick>=3.0.1 # Apache-2.0
os-brick>=3.1.0 # Apache-2.0
os-resource-classes>=0.4.0 # Apache-2.0
os-traits>=2.4.0 # Apache-2.0
os-vif>=1.14.0 # Apache-2.0
os-win>=3.0.0 # Apache-2.0
os-win>=4.2.0 # Apache-2.0
castellan>=0.16.0 # Apache-2.0
microversion-parse>=0.2.1 # Apache-2.0
os-xenapi>=0.3.3 # Apache-2.0
os-xenapi>=0.3.4 # Apache-2.0
tooz>=1.58.0 # Apache-2.0
cursive>=0.2.1 # Apache-2.0
pypowervm>=1.1.15 # Apache-2.0
retrying>=1.3.3,!=1.3.0 # Apache-2.0
os-service-types>=1.7.0 # Apache-2.0
taskflow>=2.16.0 # Apache-2.0
taskflow>=3.8.0 # Apache-2.0
python-dateutil>=2.5.3 # BSD
zVMCloudConnector>=1.3.0;sys_platform!='win32' # Apache 2.0 License
futurist>=1.8.0 # Apache-2.0

4
test-requirements.txt
View File

@ -11,10 +11,10 @@ mock>=3.0.0 # BSD
psycopg2>=2.7 # LGPL/ZPL
PyMySQL>=0.7.6 # MIT License
python-barbicanclient>=4.5.2 # Apache-2.0
python-ironicclient!=2.7.1,>=2.7.0 # Apache-2.0
python-ironicclient>=3.0.0 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0
oslotest>=3.8.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD