From fe0e5324d4248d114660ec35111ae9601e05b95b Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Sat, 2 Apr 2022 13:24:26 +0200 Subject: [PATCH] Remove py 3.6 support and update jobs Although we're not on the OpenStack release schedule as such, Zed cycle is dropping 3.6/3.7 support. This means it seems like as good a time as any to also update ourselves to this regime. One important dependency to think about is nodepool, but that is already >3.8 only so we will be in sync there. This also changes dib jobs to run using the zed template and adapts the bindep file to handle Ubuntu Jammy. [1] https://governance.openstack.org/tc/reference/runtimes/zed.html Change-Id: Ibdbcf459608711ac64e7fefb1707f6708d68e750 Co-Authored-By: Jay Faulkner Co-Authored-By: Jens Harbott Co-Authored-By: Ian Wienand --- .zuul.d/project.yaml | 2 +- bindep.txt | 6 +++--- releasenotes/notes/python-3.8-b401ad4f2bbbc99f.yaml | 3 +++ setup.cfg | 4 +--- 4 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/python-3.8-b401ad4f2bbbc99f.yaml diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index ff5e7834..3892bcf1 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -7,7 +7,7 @@ # NOTE(ianw): 2020-05-29 jobs are unstable; see # https://bugs.launchpad.net/tripleo/+bug/1879766 - tripleo-buildimage-jobs-centos-8 - - openstack-python3-wallaby-jobs + - openstack-python3-zed-jobs check: jobs: - openstack-tox-pylint diff --git a/bindep.txt b/bindep.txt index 075d3ffb..ef935fac 100644 --- a/bindep.txt +++ b/bindep.txt @@ -14,17 +14,17 @@ git squashfs-tools [!platform:suse] squashfs [platform:suse] -zypper [!platform:debian-stretch !platform:redhat !platform:ubuntu-trusty !platform:ubuntu-bionic !platform:ubuntu-focal] +zypper [!platform:debian-stretch !platform:redhat !platform:ubuntu-trusty !platform:ubuntu-bionic !platform:ubuntu-focal !platform:ubuntu-jammy] gnupg2 [!platform:redhat !platform:ubuntu-trusty !platform:suse] # ubuntu apt-transport-https [platform:dpkg] inetutils-ping [platform:dpkg] -python-lzma [platform:dpkg !platform:ubuntu-focal !platform:debian-bullseye] +python-lzma [platform:dpkg !platform:ubuntu-focal !platform:ubuntu-jammy !platform:debian-bullseye] qemu-utils [platform:dpkg] rpm [platform:dpkg] uuid-runtime [platform:dpkg] -yum-utils [platform:dpkg !platform:ubuntu-focal !platform:debian-bullseye] +yum-utils [platform:dpkg !platform:ubuntu-focal !platform:ubuntu-jammy !platform:debian-bullseye] dnf [platform:debian-bullseye] debootstrap [platform:dpkg] zstd [platform:dpkg] diff --git a/releasenotes/notes/python-3.8-b401ad4f2bbbc99f.yaml b/releasenotes/notes/python-3.8-b401ad4f2bbbc99f.yaml new file mode 100644 index 00000000..577daf76 --- /dev/null +++ b/releasenotes/notes/python-3.8-b401ad4f2bbbc99f.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - This release removes support for Python releases before 3.8 diff --git a/setup.cfg b/setup.cfg index a7ef62aa..4413ff88 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,12 +12,10 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Environment :: Console -python_requires = >=3.6 +python_requires = >=3.8 [files] packages =