On Fri, May 03, 2024 at 02:35:46PM -0500, Justin Tobler wrote: > On 24/05/03 08:57PM, Patrick Steinhardt wrote: > > On Fri, May 03, 2024 at 08:48:03PM +0200, Patrick Steinhardt wrote: > > > On Fri, May 03, 2024 at 01:42:32PM -0500, Justin Tobler wrote: > > > > On 24/04/12 06:43AM, Patrick Steinhardt wrote: [snip] > > Maybe we should do something like below patch. Basically, we start to > > acknowledge the fact that Python 2 is end of life and always use Python > > 3 on ubuntu:latest. We might go even further than that and only use > > Python 2 on ubuntu:20.04 and slowly phase out support for it. > > > > diff --git a/ci/lib.sh b/ci/lib.sh > > index 473a2d0348..3967a5af85 100755 > > --- a/ci/lib.sh > > +++ b/ci/lib.sh > > @@ -325,11 +325,18 @@ ubuntu-*) > > break > > fi > > > > - PYTHON_PACKAGE=python2 > > - if test "$jobname" = linux-gcc > > - then > > + case "$distro" in > > + ubuntu-latest) > > PYTHON_PACKAGE=python3 > > - fi > > + ;; > > + *) > > + PYTHON_PACKAGE=python2 > > + if test "$jobname" = linux-gcc > > + then > > + PYTHON_PACKAGE=python3 > > + fi > > + ;; > > + esac > > MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" > > > > export GIT_TEST_HTTPD=true > > This seems reasonable to me :) Please feel free to adopt and adapt this fix. I probably shouldn't be reading mails at this time of the day in the first place :) Patrick
Attachment:
signature.asc
Description: PGP signature
