From d55d250d336edb1892f0f40cf8be6063be3315a4 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 10 May 2022 19:04:16 -0500 Subject: [PATCH] Update python testing as per zed cycle teting runtime In Zed cycle, we have dropped the python 3.6/3.7[1] testing and its support. Moving the py36 job to py38 based as well as updating the python classifier also to reflect the same. openstack-tox-functional-py36-fips job is left which can be moved to py38|py39 based once that job is defined in openatck-zuul-jobs repo. openstack-tox-functional-py36-fips job will be migrated to py38 or py39 in followup patch as that need openstack-zuul-config changes too. [1] https://governance.openstack.org/tc/reference/runtimes/zed.html Change-Id: Id0813d9dc553dd424732079039349b42f6f3201b --- .zuul.yaml | 86 +++++++++---------- ...p-python-3-6-and-3-7-c6f051d5b2b40329.yaml | 5 ++ setup.cfg | 4 +- tox.ini | 18 +--- 4 files changed, 46 insertions(+), 67 deletions(-) create mode 100644 releasenotes/notes/drop-python-3-6-and-3-7-c6f051d5b2b40329.yaml diff --git a/.zuul.yaml b/.zuul.yaml index ce53fbcc70..b148e03767 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -67,14 +67,13 @@ tox_envlist: functional-py39 - job: - name: glance-tox-functional-py36-oslo-tips + name: glance-tox-functional-py38-oslo-tips parent: glance-tox-oslo-tips-base description: | - Glance py36 functional tests vs. oslo libraries masters - nodeset: ubuntu-bionic + Glance py38 functional tests vs. oslo libraries masters vars: - python_version: 3.6 - tox_envlist: functional-py36 + python_version: 3.8 + tox_envlist: functional-py38 - job: name: glance-tox-keystone-tips-base @@ -98,14 +97,13 @@ tox_envlist: py39 - job: - name: glance-tox-py36-keystone-tips + name: glance-tox-py38-keystone-tips parent: glance-tox-keystone-tips-base description: | - Glance py36 unit tests vs. keystone masters - nodeset: ubuntu-bionic + Glance py38 unit tests vs. keystone masters vars: - python_version: 3.6 - tox_envlist: py36 + python_version: 3.8 + tox_envlist: py38 - job: name: glance-tox-functional-py39-keystone-tips @@ -117,14 +115,13 @@ tox_envlist: functional-py39 - job: - name: glance-tox-functional-py36-keystone-tips + name: glance-tox-functional-py38-keystone-tips parent: glance-tox-keystone-tips-base description: | - Glance py36 functional tests vs. keystone masters - nodeset: ubuntu-bionic + Glance py38 functional tests vs. keystone masters vars: - python_version: 3.6 - tox_envlist: functional-py36 + python_version: 3.8 + tox_envlist: functional-py38 - job: name: glance-tox-glance_store-tips-base @@ -146,14 +143,13 @@ tox_envlist: py39 - job: - name: glance-tox-py36-glance_store-tips + name: glance-tox-py38-glance_store-tips parent: glance-tox-glance_store-tips-base description: | - Glance py36 unit tests vs. glance_store master - nodeset: ubuntu-bionic + Glance py38 unit tests vs. glance_store master vars: - python_version: 3.6 - tox_envlist: py36 + python_version: 3.8 + tox_envlist: py38 - job: name: glance-tox-functional-py39-glance_store-tips @@ -165,14 +161,13 @@ tox_envlist: functional-py39 - job: - name: glance-tox-functional-py36-glance_store-tips + name: glance-tox-functional-py38-glance_store-tips parent: glance-tox-glance_store-tips-base description: | - Glance py36 functional tests vs. glance_store master - nodeset: ubuntu-bionic + Glance py38 functional tests vs. glance_store master vars: - python_version: 3.6 - tox_envlist: functional-py36 + python_version: 3.8 + tox_envlist: functional-py38 - job: name: glance-tox-cursive-tips-base @@ -196,14 +191,13 @@ tox_envlist: py39 - job: - name: glance-tox-py36-cursive-tips + name: glance-tox-py38-cursive-tips parent: glance-tox-cursive-tips-base description: | - Glance py36 unit tests vs. cursive (and related libs) master - nodeset: ubuntu-bionic + Glance py38 unit tests vs. cursive (and related libs) master vars: - python_version: 3.6 - tox_envlist: py36 + python_version: 3.8 + tox_envlist: py38 - job: name: glance-tox-functional-py39-cursive-tips @@ -215,14 +209,13 @@ tox_envlist: functional-py39 - job: - name: glance-tox-functional-py36-cursive-tips + name: glance-tox-functional-py38-cursive-tips parent: glance-tox-cursive-tips-base description: | - Glance py36 functional tests vs. cursive (and related libs) master - nodeset: ubuntu-bionic + Glance py38 functional tests vs. cursive (and related libs) master vars: - python_version: 3.6 - tox_envlist: functional-py36 + python_version: 3.8 + tox_envlist: functional-py38 - job: name: tempest-integrated-storage-import @@ -318,13 +311,12 @@ templates: - check-requirements - integrated-gate-storage - - openstack-python3-yoga-jobs + - openstack-python3-zed-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 check: jobs: - - openstack-tox-functional-py36-fips - openstack-tox-functional-py39 - glance-tox-functional-py39-rbac-defaults - glance-code-constants-check @@ -360,7 +352,7 @@ gate: jobs: - - openstack-tox-functional-py36 + - openstack-tox-functional-py38 - openstack-tox-functional-py39 - tempest-integrated-storage: irrelevant-files: *tempest-irrelevant-files @@ -380,9 +372,9 @@ experimental: jobs: - glance-tox-py39-glance_store-tips - - glance-tox-py36-glance_store-tips + - glance-tox-py38-glance_store-tips - glance-tox-functional-py39-glance_store-tips - - glance-tox-functional-py36-glance_store-tips + - glance-tox-functional-py38-glance_store-tips - barbican-tempest-plugin-simple-crypto - grenade-multinode - tempest-pg-full: @@ -405,31 +397,31 @@ # aren't doing that either. - glance-tox-functional-py39-oslo-tips: branches: master - - glance-tox-functional-py36-oslo-tips: + - glance-tox-functional-py38-oslo-tips: branches: master - glance-tox-py39-keystone-tips: branches: master - - glance-tox-py36-keystone-tips: + - glance-tox-py38-keystone-tips: branches: master - glance-tox-functional-py39-keystone-tips: branches: master - - glance-tox-functional-py36-keystone-tips: + - glance-tox-functional-py38-keystone-tips: branches: master - glance-tox-py39-glance_store-tips: branches: master - - glance-tox-py36-glance_store-tips: + - glance-tox-py38-glance_store-tips: branches: master - glance-tox-functional-py39-glance_store-tips: branches: master - - glance-tox-functional-py36-glance_store-tips: + - glance-tox-functional-py38-glance_store-tips: branches: master - glance-tox-py39-cursive-tips: branches: master - - glance-tox-py36-cursive-tips: + - glance-tox-py38-cursive-tips: branches: master - glance-tox-functional-py39-cursive-tips: branches: master - - glance-tox-functional-py36-cursive-tips: + - glance-tox-functional-py38-cursive-tips: branches: master - glance-multistore-cinder-import-fips: branches: master diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-c6f051d5b2b40329.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-c6f051d5b2b40329.yaml new file mode 100644 index 0000000000..db420d7390 --- /dev/null +++ b/releasenotes/notes/drop-python-3-6-and-3-7-c6f051d5b2b40329.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Python 3.6 & 3.7 support has been dropped. The minimum version of Python now + supported is Python 3.8. diff --git a/setup.cfg b/setup.cfg index 32b88a939d..611f5adc2c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ description_file = author = OpenStack author_email = openstack-discuss@lists.openstack.org home_page = https://docs.openstack.org/glance/latest/ -python_requires = >=3.6 +python_requires = >=3.8 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -16,8 +16,6 @@ classifier = Programming Language :: Python Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 diff --git a/tox.ini b/tox.ini index dc263a5dac..fcb092f858 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 3.18.0 # python runtimes: https://governance.openstack.org/tc/reference/runtimes/ussuri.html -envlist = functional-py39,py39,py36,pep8 +envlist = functional-py39,py39,pep8 skipsdist = True skip_missing_interpreters = true # this allows tox to infer the base python from the environment name @@ -41,14 +41,6 @@ setenv = TEST_PATH = ./glance/tests/functional commands = stestr run {posargs} -[testenv:functional-py36] -setenv = {[testenv:functional]setenv} -commands = {[testenv:functional]commands} - -[testenv:functional-py37] -setenv = {[testenv:functional]setenv} -commands = {[testenv:functional]commands} - [testenv:functional-py38] setenv = {[testenv:functional]setenv} commands = {[testenv:functional]commands} @@ -181,14 +173,6 @@ commands = commands = oslo_debug_helper {posargs} -[testenv:debug-py36] -commands = - oslo_debug_helper {posargs} - -[testenv:debug-py37] -commands = - oslo_debug_helper {posargs} - [testenv:debug-py38] commands = oslo_debug_helper {posargs}