openstack/cinder
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: Iaa2b3e1518614caf8664af017b2a2e1a7c005b07
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2020-08-03 09:40:14 -05:00 committed by Brian Rosmaita
parent b204df52cc
commit 4af68f0621
3 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lower-constraints.txt
View File

@ -4,7 +4,6 @@ amqp==2.2.2
appdirs==1.4.3
asn1crypto==0.24.0
automaton==1.17.0
bandit==1.6.0
bcrypt==3.1.4
cachetools==2.0.1
castellan==1.3.0
@ -15,11 +14,11 @@ cliff==2.15.0
cmd2==0.8.1
contextlib2==0.5.5
coverage==4.1
cryptography==2.1
cryptography==2.1.4
cursive==0.2.1
ddt==1.2.1
debtcollector==1.22.0
decorator==3.4.0
decorator==4.1.0
doc8==0.6.0
docutils==0.14
dogpile.cache==0.6.5
@ -29,18 +28,14 @@ eventlet==0.22.0
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
flake8==2.5.5
flake8-import-order==0.18.1
flake8-logging-format==0.6.0
future==0.16.0
futurist==1.6.0
gitdb2==2.0.5
GitPython==2.1.8
google-api-python-client==1.4.2
greenlet==0.4.13
hacking==3.0.1
httplib2==0.9.1
idna==2.6
idna==2.5
imagesize==1.0.0
iso8601==0.1.12
Jinja2==2.10
@ -54,17 +49,16 @@ linecache2==1.0.0
lxml==4.2.0
Mako==1.0.7
MarkupSafe==1.1.0
mccabe==0.2.1
mock==2.0.0
msgpack==0.5.6
netaddr==0.7.19
netifaces==0.10.7
networkx==1.11
networkx==2.1.0
oauth2client==1.5.0
os-api-ref==1.4.0
os-brick==3.1.0
os-client-config==1.29.0
os-win==3.0.0
os-win==4.2.0
oslo.cache==1.29.0
oslo.concurrency==3.26.0
oslo.config==6.11.0
@ -78,9 +72,9 @@ oslo.policy==1.44.1
oslo.privsep==1.32.0
oslo.reports==1.18.0
oslo.rootwrap==5.8.0
oslo.serialization==2.18.0
oslo.service==1.24.0
oslo.utils==3.34.0
oslo.serialization==2.25.0
oslo.service==2.0.0
oslo.utils==3.40.2
oslo.versionedobjects==1.31.2
oslo.vmware==2.35.0
oslotest==3.2.0
@ -89,7 +83,6 @@ paramiko==2.4.0
Paste==2.0.2
PasteDeploy==1.5.0
pbr==5.4.1
pep8==1.5.7
pika-pool==0.1.3
pika==0.10.0
psutil==3.2.2
@ -97,9 +90,7 @@ psycopg2==2.7
pyasn1-modules==0.2.1
pyasn1==0.4.2
pycadf==2.7.0
pycodestyle==2.6.0
pycparser==2.19
pyflakes==0.8.1
Pygments==2.2.0
pyinotify==0.9.6
PyMySQL==0.7.6
@ -114,21 +105,21 @@ python-glanceclient==2.15.0
python-keystoneclient==3.15.0
python-mimeparse==1.6.0
python-novaclient==9.1.0
python-subunit==1.2.0
python-subunit==1.3.0
python-swiftclient==3.2.0
pytz==2013.6
pytz==2015.7
pyudev==0.21.0
PyYAML==5.1
reno==3.1.0
repoze.lru==0.7
requests==2.14.2
requests==2.18.0
requestsexceptions==1.4.0
retrying==1.2.3
rfc3986==1.3.0
Routes==2.3.1
rsa==3.4.2
rtslib-fb==2.1.65
six==1.10.0
six==1.11.0
smmap2==2.0.3
snowballstemmer==1.2.1
sqlalchemy-migrate==0.11.0
@ -148,10 +139,10 @@ tooz==1.58.0
traceback2==1.4.0
unittest2==1.1.0
uritemplate==3.0.0
urllib3==1.22
urllib3==1.21.1
vine==1.1.4
voluptuous==0.11.1
warlock==1.3.0
warlock==1.3.1
WebOb==1.7.1
wrapt==1.10.11
oslo.upgradecheck==0.1.0

18
requirements.txt
View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=5.4.1 # Apache-2.0
decorator>=3.4.0 # BSD
decorator>=4.1.0 # BSD
eventlet!=0.23.0,!=0.25.0,>=0.22.0 # MIT
greenlet>=0.4.13 # MIT
httplib2>=0.9.1 # MIT
@ -24,10 +24,10 @@ oslo.policy>=1.44.1 # Apache-2.0
oslo.privsep>=1.32.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0
oslo.rootwrap>=5.8.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
oslo.serialization>=2.25.0 # Apache-2.0
oslo.service>=2.0.0 # Apache-2.0
oslo.upgradecheck>=0.1.0 # Apache-2.0
oslo.utils>=3.34.0 # Apache-2.0
oslo.utils>=3.40.2 # Apache-2.0
oslo.versionedobjects>=1.31.2 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0
paramiko>=2.4.0 # LGPLv2.1+
@ -40,12 +40,12 @@ python-glanceclient>=2.15.0 # Apache-2.0
python-keystoneclient>=3.15.0 # Apache-2.0
python-novaclient>=9.1.0 # Apache-2.0
python-swiftclient>=3.2.0 # Apache-2.0
pytz>=2013.6 # MIT
requests>=2.14.2,!=2.20.0 # Apache-2.0
pytz>=2015.7 # MIT
requests>=2.18.0,!=2.20.0 # Apache-2.0
Routes>=2.3.1 # MIT
taskflow>=3.8.0 # Apache-2.0
rtslib-fb>=2.1.65 # Apache-2.0
six>=1.10.0 # MIT
six>=1.11.0 # MIT
SQLAlchemy>=1.3.0 # MIT
sqlalchemy-migrate>=0.11.0 # Apache-2.0
stevedore>=1.31.0 # Apache-2.0
@ -55,9 +55,9 @@ WebOb>=1.7.1 # MIT
oslo.i18n>=3.24.0 # Apache-2.0
oslo.vmware>=2.35.0 # Apache-2.0
os-brick>=3.1.0 # Apache-2.0
os-win>=3.0.0 # Apache-2.0
os-win>=4.2.0 # Apache-2.0
tooz>=1.58.0 # Apache-2.0
google-api-python-client>=1.4.2 # Apache-2.0
castellan>=1.3.0 # Apache-2.0
cryptography>=2.1 # BSD/Apache-2.0
cryptography>=2.1.4 # BSD/Apache-2.0
cursive>=0.2.1 # Apache-2.0

1
test-requirements.txt
View File

@ -12,7 +12,6 @@ coverage!=4.4,>=4.1 # Apache-2.0
ddt>=1.2.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0
pycodestyle==2.6.0 # MIT License
PyMySQL>=0.7.6 # MIT License
# psycopg2>=2.7 # LGPL/ZPL
SQLAlchemy-Utils>=0.36.1 # BSD License