On Tue, 29 Mar 2022 09:31:43 -0600,
Jonathan Corbet wrote:
> Akira Yokosawa <akiyks@xxxxxxxxx> writes:
>
>> jinja2 release 3.1.0 (March 24, 2022) broke Sphinx<4.0.
>> This looks like the result of deprecating Python 3.6.
>> It has been tested against Sphinx 4.3.0 and later later.
Oh, I made a staccato here.
Thank you for amending it.
>
> *Sigh*. I wish this stuff didn't feel like such a house of cards
> sometimes...
>
>> Setting an upper limit of <3.1 to junja2 can unbreak Sphinx<4.0
>> including Sphinx 2.4.4.
>>
>> Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx>
>> Cc: Jonathan Corbet <corbet@xxxxxxx>
>> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
>> Cc: linux-doc@xxxxxxxxxxxxxxx
>> ---
>> Or we can bump the requirement to Sphinx>=4.0.
>> Thoughts?
>
> It's probably time to consider a bump there, but that is a bigger one
> than I would want to do at this point. So I'll just fast-track this
> patch in; dropping it into the stable updates probably makes sense too.
This can be applied cleanly for Linux>=5.15.
For 5.10.x, there is a dependent commit:
37397b092e7f ("docs: sphinx-requirements: Move sphinx_rtd_theme to top")
Linux 5.4.x needs another one:
d5afc9640a6d ("docs: update recommended Sphinx version to 2.4.4")
... and so on.
How far do you want to backport this?
Thanks, Akira
>
> Thanks,
>
> jon
