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