On Thu, Feb 29, 2024 at 3:39 PM Vegard Nossum <vegard.nossum@xxxxxxxxxx> wrote: > > > On 27/02/2024 14:14, Lukas Bulwahn wrote: > > As discussed (see Links), there is some inertia to move to the recent > > Sphinx versions for the doc build environment. > > [...] > > > diff --git a/Documentation/sphinx/requirements.txt b/Documentation/sphinx/requirements.txt > > index 5d47ed443949..1f3b98eee2c9 100644 > > --- a/Documentation/sphinx/requirements.txt > > +++ b/Documentation/sphinx/requirements.txt > > @@ -1,6 +1,4 @@ > > -# jinja2>=3.1 is not compatible with Sphinx<4.0 > > -jinja2<3.1 > > -# alabaster>=0.7.14 is not compatible with Sphinx<=3.3 > > -alabaster<0.7.14 > > -Sphinx==2.4.4 > > +jinja2 > > +alabaster > > +Sphinx > > pyyaml > > I know you wrote this as well, but just for the record I tried dropping > jinja2 from this list and it still pulled it in automatically: Vegard, I took your suggestion and removed jinja2 from the requirements.txt in my patch v2: https://lore.kernel.org/linux-doc/20240301141800.30218-1-lukas.bulwahn@xxxxxxxxx/ So, there is no need for any further future one-line deletion patch. Jonathan, please pick the patch v2. Lukas
