diff --git a/setup.cfg b/setup.cfg index 2c940582fd..329b46833d 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/octavia/latest/ -python_requires = >=3.8 +python_requires = >=3.9 classifier = Development Status :: 5 - Production/Stable Environment :: OpenStack @@ -17,7 +17,6 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 07ed2a04e3..fb7b2ed9a2 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -112,20 +112,20 @@ name: octavia-tox-tips check: jobs: - - octavia-tox-py39-tips - - octavia-tox-functional-py39-tips + - octavia-tox-py311-tips + - octavia-tox-functional-py311-tips - project-template: name: octavia-tox-sqlalchemy-tips check: jobs: - - octavia-tox-functional-py39-sqlalchemy-tips + - octavia-tox-functional-py311-sqlalchemy-tips - job: - name: octavia-tox-py39-tips - parent: openstack-tox-py39 + name: octavia-tox-py311-tips + parent: openstack-tox-py311 description: | - Run tox python 3.9 unit tests against master of related libraries. + Run tox python 3.11 unit tests against master of related libraries. vars: tox_install_siblings: true zuul_work_dir: src/opendev.org/openstack/octavia @@ -134,10 +134,10 @@ - openstack/octavia - job: - name: octavia-tox-functional-py39-tips - parent: openstack-tox-functional-py39 + name: octavia-tox-functional-py311-tips + parent: openstack-tox-functional-py311 description: | - Run tox python 3.9 functional against master of related libraries. + Run tox python 3.11 functional against master of related libraries. vars: tox_install_siblings: true zuul_work_dir: src/opendev.org/openstack/octavia @@ -149,13 +149,14 @@ # NOTE(stephenfin): We only need functional tests since DB interactions are # stubbed out in unit tests - job: - name: octavia-tox-functional-py39-sqlalchemy-tips - parent: openstack-tox-functional-py39 + name: octavia-tox-functional-py311-sqlalchemy-tips + parent: openstack-tox-functional-py311 description: | - Run tox python 3.9 functional against master of sqlalchemy and related projects + Run tox python 3.11 functional against master of sqlalchemy and related + projects # The job only tests the latest and shouldn't be run on the stable branches branches: - regex: ^stable + regex: ^(stable|unmaintained) negate: true required-projects: - name: openstack/oslo.db diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 4541aad682..230b766204 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -20,16 +20,8 @@ - ^etc/.*$ - ^octavia/tests/.*$ - ^releasenotes/.*$ - - openstack-tox-functional-py38: - irrelevant-files: - - ^.*\.rst$ - - ^api-ref/.*$ - - ^doc/.*$ - - ^etc/.*$ - - ^octavia/tests/unit/.*$ - - ^releasenotes/.*$ - openstack-tox-functional-py39: - irrelevant-files: + irrelevant-files: &tox-func-irrelevant-files - ^.*\.rst$ - ^api-ref/.*$ - ^doc/.*$ @@ -37,14 +29,13 @@ - ^octavia/tests/unit/.*$ - ^releasenotes/.*$ - openstack-tox-functional-py310: - irrelevant-files: - - ^.*\.rst$ - - ^api-ref/.*$ - - ^doc/.*$ - - ^etc/.*$ - - ^octavia/tests/unit/.*$ - - ^releasenotes/.*$ - voting: false + irrelevant-files: *tox-func-irrelevant-files + - openstack-tox-functional-py311: + irrelevant-files: *tox-func-irrelevant-files + # Undefined yet: +# - openstack-tox-functional-py312: +# irrelevant-files: *tox-irrelevant-files +# voting: false - octavia-v2-dsvm-noop-api: irrelevant-files: &irrelevant-files - ^.*\.rst$ @@ -106,7 +97,7 @@ - ^etc/.*$ - ^octavia/tests/.*$ - ^releasenotes/.*$ - - openstack-tox-functional-py38: + - openstack-tox-functional-py311: irrelevant-files: - ^.*\.rst$ - ^api-ref/.*$