openstack/cinder
Code Issues Proposed changes

Update requirements and lower-constraints

Browse Source 
Bring the versions specified in requirements.txt and test-req.txt
closer to what's actually being used in the py36 and py38 testenvs,
and update lower-constraints to reflect the updated requirements.

What has made this necessary right now is that the latest pip has
introduced a much stricter resolver, and the cinder lower-constraints
job is failing because cinder is imposing some constraints which are
too low for some dependencies, and we can't get away with that under
the stricter resolver.

Change-Id: I42af21b1c4247d04d479f1fc1ecd6f9baac0cfc9
This commit is contained in:
Brian Rosmaita 2020-12-08 15:02:48 -05:00
parent 95d00bd7a6
commit d3ffa90baa
3 changed files with 181 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
lower-constraints.txt
View File

@ -1,154 +1,140 @@
alabaster==0.7.10 alembic==1.4.2
alembic==1.0.0 amqp==2.6.1
amqp==2.2.2 automaton==2.2.0
appdirs==1.4.3 bcrypt==3.2.0
asn1crypto==0.24.0 cachetools==4.1.1
automaton==1.17.0 castellan==3.6.0
bcrypt==3.1.4 certifi==2020.6.20
cachetools==2.0.1 cffi==1.14.2
castellan==1.3.0
certifi==2018.1.18
cffi==1.14.0
chardet==3.0.4 chardet==3.0.4
cliff==2.15.0 cliff==3.4.0
cmd2==0.8.1 cmd2==1.3.8
contextlib2==0.5.5 coverage==5.2.1
coverage==4.1 cryptography==3.1
cryptography==2.1.4 cursive==0.2.2
cursive==0.2.1 ddt==1.4.1
ddt==1.2.1 debtcollector==2.2.0
debtcollector==1.22.0 decorator==4.4.2
decorator==4.1.0 doc8==0.8.1
doc8==0.6.0 docutils==0.15.2
docutils==0.14 dogpile.cache==1.0.2
dogpile.cache==0.6.5 dulwich==0.20.6
dulwich==0.19.0 eventlet==0.26.1
enum-compat==0.0.2
eventlet==0.26.0
extras==1.0.0 extras==1.0.0
fasteners==0.14.1 fasteners==0.14.1
fixtures==3.0.0 fixtures==3.0.0
future==0.16.0 future==0.18.2
futurist==1.6.0 futurist==2.3.0
gitdb2==2.0.5 gitdb2==4.0.5
GitPython==2.1.8 GitPython==3.1.7
google-api-python-client==1.4.2 google-api-python-client==1.11.0
greenlet==0.4.15 greenlet==0.4.16
httplib2==0.9.1 httplib2==0.18.1
idna==2.5 idna==2.10
imagesize==1.0.0 importlib-metadata==3.1.1
importlib-metadata==1.7.0
iso8601==0.1.12 iso8601==0.1.12
Jinja2==2.10 Jinja2==2.11.2
jsonpatch==1.21 jsonpatch==1.26
jsonpointer==2.0 jsonpointer==2.0
jsonschema==3.2.0 jsonschema==3.2.0
keystoneauth1==3.14.0 keystoneauth1==4.2.1
keystonemiddleware==4.21.0 keystonemiddleware==9.1.0
kombu==5.0.1 kombu==5.0.1
linecache2==1.0.0 linecache2==1.0.0
lxml==4.2.0 lxml==4.5.2
Mako==1.0.7 Mako==1.1.3
MarkupSafe==1.1.0 MarkupSafe==1.1.1
mock==2.0.0 msgpack==1.0.0
msgpack==0.5.6 mypy==0.782
mypy==0.761 netaddr==0.8.0
netaddr==0.7.19 netifaces==0.10.9
netifaces==0.10.7 networkx==2.5
networkx==2.1.0 oauth2client==4.1.3
oauth2client==1.5.0
os-api-ref==1.4.0 os-api-ref==1.4.0
os-brick==4.0.1 os-brick==4.0.1
os-client-config==1.29.0 os-win==5.1.0
os-win==4.2.0 oslo.cache==2.6.1
oslo.cache==1.29.0 oslo.concurrency==4.3.0
oslo.concurrency==3.26.0 oslo.config==8.3.2
oslo.config==6.11.0 oslo.context==3.1.1
oslo.context==2.23.0 oslo.db==8.4.0
oslo.db==6.0.0 oslo.i18n==5.0.1
oslo.i18n==3.24.0 oslo.log==4.4.0
oslo.log==4.3.0 oslo.messaging==12.5.0
oslo.messaging==6.4.0 oslo.middleware==4.1.1
oslo.middleware==3.31.0 oslo.policy==3.5.0
oslo.policy==1.44.1 oslo.privsep==2.4.0
oslo.privsep==2.3.0 oslo.reports==2.2.0
oslo.reports==1.18.0 oslo.rootwrap==6.2.0
oslo.rootwrap==5.8.0 oslo.serialization==4.0.1
oslo.serialization==2.25.0 oslo.service==2.4.0
oslo.service==2.0.0 oslo.upgradecheck==1.1.1
oslo.utils==4.7.0 oslo.utils==4.7.0
oslo.versionedobjects==1.31.2 oslo.versionedobjects==2.3.0
oslo.vmware==2.35.0 oslo.vmware==3.7.0
oslotest==3.2.0 oslotest==4.4.1
osprofiler==1.4.0 osprofiler==3.4.0
packaging==20.4 packaging==20.4
paramiko==2.7.1 paramiko==2.7.2
Paste==2.0.2 Paste==3.4.3
PasteDeploy==1.5.0 PasteDeploy==2.1.0
pbr==5.4.1 pbr==5.5.0
pika-pool==0.1.3 psutil==5.7.2
pika==0.10.0 psycopg2==2.8.5
psutil==3.2.2 pyasn1-modules==0.2.8
psycopg2==2.8 pyasn1==0.4.8
pyasn1-modules==0.2.1 pycadf==3.1.1
pyasn1==0.4.2 pycparser==2.20
pycadf==2.7.0 Pygments==2.6.1
pycparser==2.19
Pygments==2.2.0
pyinotify==0.9.6 pyinotify==0.9.6
PyMySQL==0.8.0 PyMySQL==0.10.0
PyNaCl==1.2.1 PyNaCl==1.4.0
pyOpenSSL==17.5.0 pyOpenSSL==17.5.0
pyparsing==2.2.1 pyparsing==2.4.7
pyperclip==1.6.0 pyperclip==1.8.0
python-barbicanclient==4.9.0 python-barbicanclient==5.0.1
python-dateutil==2.7.0 python-dateutil==2.8.1
python-editor==1.0.4 python-editor==1.0.4
python-glanceclient==2.15.0 python-glanceclient==3.2.2
python-keystoneclient==3.15.0 python-keystoneclient==4.1.1
python-mimeparse==1.6.0 python-mimeparse==1.6.0
python-novaclient==9.1.0 python-novaclient==17.2.1
python-subunit==1.4.0 python-subunit==1.4.0
python-swiftclient==3.2.0 python-swiftclient==3.10.1
pytz==2015.7 pytz==2020.1
pyudev==0.21.0 pyudev==0.22.0
PyYAML==5.1 PyYAML==5.3.1
reno==3.1.0 reno==3.2.0
repoze.lru==0.7 repoze.lru==0.7
requests==2.18.0 requests==2.23.0
requestsexceptions==1.4.0 rfc3986==1.4.0
retrying==1.2.3 Routes==2.4.1
rfc3986==1.3.0 rsa==4.6
Routes==2.3.1 rtslib-fb==2.1.74
rsa==3.4.2 six==1.15.0
rtslib-fb==2.1.65 smmap2==3.0.4
six==1.11.0
smmap2==2.0.3
snowballstemmer==1.2.1
sqlalchemy-migrate==0.13.0 sqlalchemy-migrate==0.13.0
SQLAlchemy==1.3.0 SQLAlchemy==1.3.19
SQLAlchemy-Utils==0.36.1 SQLAlchemy-Utils==0.36.8
sqlparse==0.2.4 sqlparse==0.3.1
statsd==3.2.2 statsd==3.3.0
stestr==2.2.0 stestr==3.0.1
stevedore==1.31.0 stevedore==3.2.2
tabulate==0.8.5 tabulate==0.8.7
taskflow==3.8.0 taskflow==4.5.0
Tempita==0.5.2 Tempita==0.5.2
tenacity==6.1.0 tenacity==6.2.0
testrepository==0.0.20
testtools==2.4.0 testtools==2.4.0
tooz==1.58.0 tooz==2.7.1
traceback2==1.4.0 traceback2==1.4.0
unittest2==1.1.0 unittest2==1.1.0
uritemplate==3.0.0 uritemplate==3.0.1
urllib3==1.21.1 urllib3==1.25.10
vine==1.1.4 vine==1.1.3
voluptuous==0.11.1 voluptuous==0.11.7
warlock==1.3.1 warlock==1.3.3
WebOb==1.7.1 WebOb==1.8.6
wrapt==1.10.11 wrapt==1.12.1
oslo.upgradecheck==0.1.0
websocket-client==0.32.0 websocket-client==0.32.0
storops==0.5.10 storops==0.5.10
pywbem==0.7.0 pywbem==0.7.0
@ -163,4 +149,4 @@ rsd-lib==1.1.0
storpool==4.0.0 storpool==4.0.0
storpool.spopenstack==2.2.1 storpool.spopenstack==2.2.1
dfs_sdk==1.2.25 dfs_sdk==1.2.25
zstd==1.4.5.0 zstd==1.4.5.1

112
requirements.txt
View File

@ -2,65 +2,65 @@
# 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,>=5.4.1 # Apache-2.0 pbr>=5.5.0 # Apache-2.0
decorator>=4.1.0 # BSD decorator>=4.4.2 # BSD
eventlet>=0.26.0 # MIT eventlet>=0.26.1 # MIT
greenlet>=0.4.15 # MIT greenlet>=0.4.16 # MIT
httplib2>=0.9.1 # MIT httplib2>=0.18.1 # MIT
importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0 importlib_metadata>=3.1.1;python_version<'3.8' # Apache-2.0
iso8601>=0.1.12 # MIT iso8601>=0.1.12 # MIT
jsonschema>=3.2.0 # MIT jsonschema>=3.2.0 # MIT
keystoneauth1>=3.14.0 # Apache-2.0 keystoneauth1>=4.2.1 # Apache-2.0
keystonemiddleware>=4.21.0 # Apache-2.0 keystonemiddleware>=9.1.0 # Apache-2.0
lxml>=4.2.0 # BSD lxml>=4.5.2 # BSD
oauth2client!=4.0.0,>=1.5.0 # Apache-2.0 oauth2client>=4.1.3 # Apache-2.0
oslo.config>=6.11.0 # Apache-2.0 oslo.config>=8.3.2 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0 oslo.concurrency>=4.3.0 # Apache-2.0
oslo.context>=2.23.0 # Apache-2.0 oslo.context>=3.1.1 # Apache-2.0
oslo.db>=6.0.0 # Apache-2.0 oslo.db>=8.4.0 # Apache-2.0
oslo.log>=4.3.0 # Apache-2.0 oslo.log>=4.4.0 # Apache-2.0
oslo.messaging>=6.4.0 # Apache-2.0 oslo.messaging>=12.5.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0 oslo.middleware>=4.1.1 # Apache-2.0
oslo.policy>=1.44.1 # Apache-2.0 oslo.policy>=3.5.0 # Apache-2.0
oslo.privsep>=2.3.0 # Apache-2.0 oslo.privsep>=2.4.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0 oslo.reports>=2.2.0 # Apache-2.0
oslo.rootwrap>=5.8.0 # Apache-2.0 oslo.rootwrap>=6.2.0 # Apache-2.0
oslo.serialization>=2.25.0 # Apache-2.0 oslo.serialization>=4.0.1 # Apache-2.0
oslo.service>=2.0.0 # Apache-2.0 oslo.service>=2.4.0 # Apache-2.0
oslo.upgradecheck>=0.1.0 # Apache-2.0 oslo.upgradecheck>=1.1.1 # Apache-2.0
oslo.utils>=4.7.0 # Apache-2.0 oslo.utils>=4.7.0 # Apache-2.0
oslo.versionedobjects>=1.31.2 # Apache-2.0 oslo.versionedobjects>=2.3.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0 osprofiler>=3.4.0 # Apache-2.0
packaging>=20.4 packaging>=20.4
paramiko>=2.7.1 # LGPLv2.1+ paramiko>=2.7.2 # LGPLv2.1+
Paste>=2.0.2 # MIT Paste>=3.4.3 # MIT
PasteDeploy>=1.5.0 # MIT PasteDeploy>=2.1.0 # MIT
psutil>=3.2.2 # BSD psutil>=5.7.2 # BSD
pyparsing>=2.2.1 # MIT pyparsing>=2.4.7 # MIT
python-barbicanclient>=4.9.0 # Apache-2.0 python-barbicanclient>=5.0.1 # Apache-2.0
python-glanceclient>=2.15.0 # Apache-2.0 python-glanceclient>=3.2.2 # Apache-2.0
python-keystoneclient>=3.15.0 # Apache-2.0 python-keystoneclient>=4.1.1 # Apache-2.0
python-novaclient>=9.1.0 # Apache-2.0 python-novaclient>=17.2.1 # Apache-2.0
python-swiftclient>=3.2.0 # Apache-2.0 python-swiftclient>=3.10.1 # Apache-2.0
pytz>=2015.7 # MIT pytz>=2020.1 # MIT
requests>=2.18.0,!=2.20.0 # Apache-2.0 requests>=2.23.0,!=2.20.0 # Apache-2.0
Routes>=2.3.1 # MIT Routes>=2.4.1 # MIT
taskflow>=3.8.0 # Apache-2.0 taskflow>=4.5.0 # Apache-2.0
rtslib-fb>=2.1.65 # Apache-2.0 rtslib-fb>=2.1.74 # Apache-2.0
six>=1.11.0 # MIT six>=1.15.0 # MIT
SQLAlchemy>=1.3.0 # MIT SQLAlchemy>=1.3.19 # MIT
sqlalchemy-migrate>=0.13.0 # Apache-2.0 sqlalchemy-migrate>=0.13.0 # Apache-2.0
stevedore>=1.31.0 # Apache-2.0 stevedore>=3.2.2 # Apache-2.0
tabulate>=0.8.5 # MIT tabulate>=0.8.7 # MIT
tenacity>=6.1.0 # Apache-2.0 tenacity>=6.2.0 # Apache-2.0
WebOb>=1.7.1 # MIT WebOb>=1.8.6 # MIT
oslo.i18n>=3.24.0 # Apache-2.0 oslo.i18n>=5.0.1 # Apache-2.0
oslo.vmware>=2.35.0 # Apache-2.0 oslo.vmware>=3.7.0 # Apache-2.0
os-brick>=4.0.1 # Apache-2.0 os-brick>=4.0.1 # Apache-2.0
os-win>=4.2.0 # Apache-2.0 os-win>=5.1.0 # Apache-2.0
tooz>=1.58.0 # Apache-2.0 tooz>=2.7.1 # Apache-2.0
google-api-python-client>=1.4.2 # Apache-2.0 google-api-python-client>=1.11.0 # Apache-2.0
castellan>=1.3.0 # Apache-2.0 castellan>=3.6.0 # Apache-2.0
cryptography>=2.1.4 # BSD/Apache-2.0 cryptography>=3.1 # BSD/Apache-2.0
cursive>=0.2.1 # Apache-2.0 cursive>=0.2.2 # Apache-2.0
zstd>=1.4.5.0 # BSD zstd>=1.4.5.1 # BSD

22
test-requirements.txt
View File

@ -7,21 +7,21 @@ hacking>=3.1.0,<3.2.0 # Apache-2.0
flake8-import-order # LGPLv3 flake8-import-order # LGPLv3
flake8-logging-format>=0.6.0 # Apache-2.0 flake8-logging-format>=0.6.0 # Apache-2.0
stestr>=2.2.0 # Apache-2.0 stestr>=3.0.1 # Apache-2.0
coverage!=4.4,>=4.1 # Apache-2.0 coverage>=5.2.1 # Apache-2.0
ddt>=1.2.1 # MIT ddt>=1.4.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0 oslotest>=4.4.1 # Apache-2.0
PyMySQL>=0.8.0 # MIT License PyMySQL>=0.10.0 # MIT License
psycopg2>=2.8 # LGPL/ZPL psycopg2>=2.8.5 # LGPL/ZPL
SQLAlchemy-Utils>=0.36.1 # BSD License SQLAlchemy-Utils>=0.36.8 # BSD License
testtools>=2.4.0 # MIT testtools>=2.4.0 # MIT
# bandit is not included in upper-constraints, # bandit is not included in upper-constraints,
# so we need to pin it here to a known working version # so we need to pin it here to a known working version
bandit==1.6.0 # Apache-2.0 bandit==1.6.0 # Apache-2.0
doc8>=0.6.0 # Apache-2.0 doc8>=0.8.1 # Apache-2.0
reno>=3.1.0 # Apache-2.0 reno>=3.2.0 # Apache-2.0
Pygments>=2.2.0 # BSD license Pygments>=2.6.1 # BSD license
mypy>=0.761 # MIT mypy>=0.782 # MIT