Add python3.8 requirement

According to the QA's request[1], we should drop the python3.6
support in Zed cycle, and add the requirement to python3.8.

[1]:http://lists.openstack.org/pipermail/openstack-discuss/2022-April/028321.html

Change-Id: I772621f28d723c88e227edd3b540ce133ea3feb2
This commit is contained in:
wanghao 2022-04-27 13:46:31 +08:00
parent a37018a3ad
commit 2abee24a02
6 changed files with 25 additions and 9 deletions

View File

@ -75,10 +75,12 @@
- project: - project:
templates: templates:
- check-requirements - openstack-python3-zed-jobs
- openstack-python3-ussuri-jobs - openstack-python3-zed-jobs-arm64
- periodic-stable-jobs
- publish-openstack-docs-pti - publish-openstack-docs-pti
- periodic-stable-jobs
- check-requirements
- integrated-gate-storage
- release-notes-jobs-python3 - release-notes-jobs-python3
check: check:
jobs: jobs:

View File

@ -14,7 +14,7 @@ msgpack>=1.0.0 # Apache-2.0
python-memcached>=1.56 # PSF python-memcached>=1.56 # PSF
python-swiftclient>=3.10.1 # Apache-2.0 python-swiftclient>=3.10.1 # Apache-2.0
WebOb>=1.7.1 # MIT WebOb>=1.7.1 # MIT
stevedore>=1.20.0 # Apache-2.0 stevedore>=3.2.2 # Apache-2.0
oslo.cache>=1.26.0 # Apache-2.0 oslo.cache>=1.26.0 # Apache-2.0
oslo.config>=6.8.0 # Apache-2.0 oslo.config>=6.8.0 # Apache-2.0
oslo.context>=2.19.2 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0
@ -29,6 +29,6 @@ oslo.utils>=3.33.0 # Apache-2.0
oslo.policy>=3.6.0 # Apache-2.0 oslo.policy>=3.6.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.3.19 # MIT SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.3.19 # MIT
autobahn>=20.7.1 # MIT License autobahn>=22.3.2 # MIT License
requests>=2.25.0 # Apache-2.0 requests>=2.25.0 # Apache-2.0
futurist>=1.2.0 # Apache-2.0 futurist>=1.2.0 # Apache-2.0

View File

@ -6,6 +6,7 @@ description_file =
author = OpenStack author = OpenStack
author_email = openstack-discuss@lists.openstack.org author_email = openstack-discuss@lists.openstack.org
home_page = https://docs.openstack.org/zaqar/latest/ home_page = https://docs.openstack.org/zaqar/latest/
python_requires = >=3.8
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -13,10 +14,14 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.9
project_urls:
Source=https://opendev.org/openstack/zaqar
Tracker=https://bugs.launchpad.net/zaqar
[files] [files]
packages = packages =

View File

@ -86,7 +86,12 @@ def load_storage_impl(uri, control_mode=False, default_store=None):
mode = 'control' if control_mode else 'data' mode = 'control' if control_mode else 'data'
driver_type = 'zaqar.{0}.storage'.format(mode) driver_type = 'zaqar.{0}.storage'.format(mode)
storage_type = urllib_parse.urlparse(uri).scheme or default_store # Note(wanghao): In python3.9, urlparse will return 'localhost' as scheme
# instead of '' in python3.8 when uri string is 'localhost:xxxxx'. So there
# need to handle this change.
storage_type = urllib_parse.urlparse(uri).scheme
if storage_type == '' or storage_type == 'localhost':
storage_type = default_store
try: try:
mgr = driver.DriverManager(driver_type, storage_type, mgr = driver.DriverManager(driver_type, storage_type,

View File

@ -5,7 +5,8 @@ enable_deprecated_api_versions = 1,1.1
[drivers] [drivers]
transport = wsgi transport = wsgi
message_store = sqlalchemy message_store = mongodb
management_store = sqlalchemy
[drivers:transport:wsgi] [drivers:transport:wsgi]
bind = 0.0.0.0 bind = 0.0.0.0

View File

@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import txaio
txaio.use_asyncio()
from autobahn.asyncio import websocket from autobahn.asyncio import websocket
import msgpack import msgpack
from oslo_serialization import jsonutils from oslo_serialization import jsonutils