[PATCH 7/8] ci: drop now-dead Python 2 coverage
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Oct 8, 2026, 10:01 UTC
- Message-ID
- <20261008-pks-ci-housekeeping-v1-7-baf015c589c0@pks.im>
- In-Reply-To
- <20261008-pks-ci-housekeeping-v1-0-baf015c589c0@pks.im>
In the preceding commit we've dropped the last job that still used Ubuntu 20.04. We still had some conditional logic for that specific image that made us use Python 2 instead of Python 3, but this is dead code now.
We could of course exercise Python 2 in any of our other CI jobs. But it reached end of life in 2020 already, and none of the distros that we use have it packaged anymore. Furthermore, it seems like the world has finally adapted to Python 3. So it doesn't feel all that useful to still exercise it.
Drop the logic and instead use Python 3 unconditionally.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- ci/install-dependencies.sh | 2 +- ci/lib.sh | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 8783b48951..4b1733ad15 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -61,7 +61,7 @@ ubuntu-*|i386/debian-*|debian-*) tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \ libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \ libsecret-1-dev libpcre2-dev meson ninja-build pkg-config cargo \ - ${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE + ${CC_PACKAGE:-${CC:-gcc}} python3 # Starting with Ubuntu 25.10, sudo can now be provided via either # sudo(1) or sudo-rs(1), with the latter being the default. The problem diff --git a/ci/lib.sh b/ci/lib.sh index d99e7b9da1..3ec10488d4 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -335,16 +335,7 @@ esac case "$distro" in ubuntu-*) - # Python 2 is end of life, and Ubuntu 23.04 and newer don't actually - # have it anymore. We thus only test with Python 2 on older LTS - # releases. - if test "$distro" = "ubuntu-20.04" - then - PYTHON_PACKAGE=python2 - else - PYTHON_PACKAGE=python3 - fi - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" export GIT_TEST_HTTPD=true
-- 2.56.0.406.ga2d225a756.dirty