diff options
| -rw-r--r-- | lower-constraints.txt | 14 | ||||
| -rw-r--r-- | openstack_dashboard/test/test_data/cinder_data.py | 20 | ||||
| -rw-r--r-- | requirements.txt | 12 |
3 files changed, 15 insertions, 31 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index 2859e446f..5ef4ed063 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -39,7 +39,7 @@ jmespath==0.9.0 jsonpatch==1.16 jsonpointer==1.13 jsonschema==2.6.0 -keystoneauth1==3.4.0 +keystoneauth1==4.3.1 kombu==4.0.0 linecache2==1.0.0 MarkupSafe==1.0 @@ -57,7 +57,7 @@ osc-lib==1.8.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 oslo.context==2.22.0 -oslo.i18n==3.15.3 +oslo.i18n==5.0.1 oslo.log==3.36.0 oslo.messaging==5.29.0 oslo.middleware==3.31.0 @@ -65,11 +65,11 @@ oslo.policy==3.2.0 oslo.serialization==2.18.0 oslo.service==1.24.0 oslo.upgradecheck==0.1.1 -oslo.utils==3.40.0 +oslo.utils==4.8.0 osprofiler==2.3.0 Paste==2.0.2 PasteDeploy==1.5.0 -pbr==2.0.0 +pbr==5.5.0 pep8==1.5.7 pika==0.10.0 pika-pool==0.1.3 @@ -87,7 +87,7 @@ pyScss==1.3.7 pytest==5.3.5 pytest-django==3.8.0 pytest-html==2.0.1 -python-cinderclient==5.0.0 +python-cinderclient==8.0.0 python-dateutil==2.8.1 python-glanceclient==2.8.0 python-keystoneclient==3.22.0 @@ -101,7 +101,7 @@ PyYAML==3.12 rcssmin==1.0.6 reno==3.1.0 repoze.lru==0.7 -requests==2.14.2 +requests==2.25.1 requestsexceptions==1.2.0 restructuredtext-lint==1.1.1 rfc3986==0.3.1 @@ -113,7 +113,7 @@ simplejson==3.5.1 six==1.12.0 snowballstemmer==1.2.1 statsd==3.2.1 -stevedore==1.20.0 +stevedore==3.3.0 tenacity==3.2.1 termcolor==1.1.0 testscenarios==0.4 diff --git a/openstack_dashboard/test/test_data/cinder_data.py b/openstack_dashboard/test/test_data/cinder_data.py index ad42c4696..cc2f72681 100644 --- a/openstack_dashboard/test/test_data/cinder_data.py +++ b/openstack_dashboard/test/test_data/cinder_data.py @@ -20,10 +20,12 @@ from cinderclient.v3 import groups from cinderclient.v3 import messages from cinderclient.v3 import pools from cinderclient.v3 import qos_specs +from cinderclient.v3 import quotas from cinderclient.v3 import services from cinderclient.v3 import volume_backups as vol_backups from cinderclient.v3 import volume_encryption_types as vol_enc_types from cinderclient.v3 import volume_snapshots as vol_snaps +from cinderclient.v3 import volume_transfers from cinderclient.v3 import volume_type_access from cinderclient.v3 import volume_types from cinderclient.v3 import volumes @@ -33,24 +35,6 @@ from openstack_dashboard.api import cinder as cinder_api from openstack_dashboard.test.test_data import utils from openstack_dashboard.usage import quotas as usage_quotas -# FIXME: workaround for some classes being missing from cinderclient.v3 -# in python-cinderclient versions < 8.0.0. These can become simple -# 'from cinderclient.v3 import xxx' above after we have -# python-cinderclient>=8.0.0 in requirements.txt -try: - # pylint: disable=ungrouped-imports - from cinderclient.v3.quotas import QuotaSet as _qs # noqa - from cinderclient.v3 import quotas # noqa -except ImportError: - from cinderclient.v2 import quotas - -try: - # pylint: disable=ungrouped-imports - from cinderclient.v3.volume_transfers import VolumeTransfer as _vt # noqa - from cinderclient.v3 import volume_transfers # noqa -except ImportError: - from cinderclient.v2 import volume_transfers - def data(TEST): TEST.cinder_messages = utils.TestDataContainer() diff --git a/requirements.txt b/requirements.txt index db747e155..37866b9d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ # be installed in a specific order. # # PBR should always appear first -pbr!=2.1.0,>=2.0.0 # Apache-2.0 +pbr>=5.5.0 # Apache-2.0 # Horizon Core Requirements Babel>=2.6.0 # BSD @@ -18,19 +18,19 @@ django-debreach>=1.4.2 # BSD License (2 clause) django-pyscss>=2.0.2 # BSD License (2 clause) futurist>=1.2.0 # Apache-2.0 iso8601>=0.1.11 # MIT -keystoneauth1>=3.4.0 # Apache-2.0 +keystoneauth1>=4.3.1 # Apache-2.0 netaddr>=0.7.18 # BSD oslo.concurrency>=3.26.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 -oslo.i18n>=3.15.3 # Apache-2.0 +oslo.i18n>=5.0.1 # Apache-2.0 oslo.policy>=3.2.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.upgradecheck>=0.1.1 # Apache-2.0 -oslo.utils>=3.40.0 # Apache-2.0 +oslo.utils>=4.8.0 # Apache-2.0 osprofiler>=2.3.0 # Apache-2.0 pymongo!=3.1,>=3.0.2 # Apache-2.0 pyScss>=1.3.7 # MIT License -python-cinderclient>=5.0.0 # Apache-2.0 +python-cinderclient>=8.0.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0 python-keystoneclient>=3.22.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0 @@ -38,7 +38,7 @@ python-novaclient>=9.1.0 # Apache-2.0 python-swiftclient>=3.2.0 # Apache-2.0 pytz>=2013.6 # MIT PyYAML>=3.12 # MIT -requests>=2.14.2 # Apache-2.0 +requests>=2.25.1 # Apache-2.0 semantic-version>=2.3.1 # BSD XStatic>=1.0.0 # MIT License XStatic-Angular>=1.5.8.0 # MIT License |