From 68f6362018fac45360ae31afdbb0712466056d50 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Mon, 18 Nov 2024 17:58:28 -0800 Subject: [PATCH] Updating testing as per the 2025.1 cycle testing runtime As per 2025.1 testing runtime[1], we are tetsing from python 3.9 till python 3.12, moving functional job to python 3.12 and updating the same in python classifier. Bump the hacking version to 7.0.0 for consistency with the other cinder projects and to fix the pep8 job on Ubuntu Noble. Also, add 'netifaces' to requirements; it has been explicitly used by the code for a long time, but was never included in requirements. Whatever had been supplying it apparently no longer has netifaces as a dependency. Closes-Bug: #2088356 Depends-On: https://review.opendev.org/c/openstack/tempest/+/932156 [1] https://governance.openstack.org/tc/reference/runtimes/2025.1.html Co-authored-by: Ghanshyam Mann Co-authored-by: Brian Rosmaita Change-Id: I9e5be7856d6985f7811c66ef3846fd353c51e7af --- .zuul.yaml | 12 +++++------- requirements.txt | 1 + setup.cfg | 3 ++- test-requirements.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e79706f..5e085f3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -53,13 +53,11 @@ tox_envlist: functional-py39 - job: - name: brick-cinderclient-dsvm-functional-py311 + name: brick-cinderclient-dsvm-functional-py312 parent: brick-cinderclient-dsvm-functional-base - # use debian bookworm, where py3.11 is the default - nodeset: devstack-single-node-debian-bookworm vars: - python_version: 3.11 - tox_envlist: functional-py311 + python_version: 3.12 + tox_envlist: functional-py312 - project: templates: @@ -70,8 +68,8 @@ check: jobs: - brick-cinderclient-dsvm-functional-py39 - - brick-cinderclient-dsvm-functional-py311 + - brick-cinderclient-dsvm-functional-py312 gate: jobs: - brick-cinderclient-dsvm-functional-py39 - - brick-cinderclient-dsvm-functional-py311 + - brick-cinderclient-dsvm-functional-py312 diff --git a/requirements.txt b/requirements.txt index 0e12980..2e8c19e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ pbr>=5.5.1 # Apache-2.0 python-cinderclient>=9.0.0 # Apache-2.0 os-brick>=6.0.0 # Apache-2.0 oslo.concurrency>=5.0.0 # Apache-2.0 +netifaces>=0.11.0 diff --git a/setup.cfg b/setup.cfg index a2e009c..6dc4597 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ long_description = file: README.rst author = OpenStack author_email = openstack-discuss@lists.openstack.org url = http://docs.openstack.org/cinder/latest/ -python_requires = >=3.8 +python_requires = >=3.9 classifiers = Environment :: OpenStack Intended Audience :: Information Technology @@ -19,6 +19,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 [files] packages = diff --git a/test-requirements.txt b/test-requirements.txt index 5cfe747..60c8aef 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=4.0.0,<4.1.0 # Apache-2.0 +hacking>=7.0.0,<7.1.0 # Apache-2.0 coverage>=5.5 # Apache-2.0 ddt>=1.4.1 # MIT oslotest>=4.4.1 # Apache-2.0