On Mon, May 19, 2025 at 1:47 PM John Snow <js...@redhat.com> wrote:
>
>
> On Sat, May 10, 2025 at 2:17 AM Akihiko Odaki <akihiko.od...@daynix.com>
> wrote:
>
>> Supersedes: <20250505-sphinx82-v1-0-85f2418b3...@daynix.com>
>> ("[PATCH 0/2] docs: Bump sphinx to 8.2.3")
>>
>> sphinx 5.3.0 fails with Python 3.13.1:
>>
>> ../docs/meson.build:37: WARNING:
>> /home/me/qemu/build/pyvenv/bin/sphinx-build:
>> Extension error:
>> Could not import extension sphinx.builders.epub3 (exception: No module
>> named 'imghdr')
>>
>> ../docs/meson.build:39:6: ERROR: Problem encountered: Install a Python 3
>> version of python-sphinx and the readthedoc theme
>>
>> Bump sphinx to 6.2.1 and also sphinx_rtd_theme as required for the new
>> sphinx version.
>>
>> Signed-off-by: Akihiko Odaki <akihiko.od...@daynix.com>
>>
>
> Reviewed-by: John Snow <js...@redhat.com>
>
> I figure if this causes issues, this early in the development cycle we can
> roll it back or pursue alternate solutions if necessary. I figure because
> this touches so much stuff I wrote, it probably ought to go through my
> tree, so I'll stage this tentatively.
>
> (Paolo, Peter: But if you want to stage it instead, be my guest.)
>
> ---
>> Akihiko Odaki (3):
>> docs: Bump sphinx to 6.2.1
>> docs: Require sphinx>=6.2
>> MAINTAINERS: Add docs/requirements.txt
>>
>> MAINTAINERS | 1 +
>> docs/requirements.txt | 4 +-
>> docs/sphinx/compat.py | 230
>> ---------------------------------------------
>>
>
> Oh, thank you so much O:-) how beautiful...
>
>
>> docs/sphinx/qapi_domain.py | 33 +++----
>> pythondeps.toml | 4 +-
>> 5 files changed, 20 insertions(+), 252 deletions(-)
>> ---
>> base-commit: 1da8f3a3c53b604edfe0d55e475102640490549e
>> change-id: 20250508-sphinx72-400c521af710
>>
>> Best regards,
>> --
>> Akihiko Odaki <akihiko.od...@daynix.com>
>
>
Just a note to say that I started staging and testing this and found a few
problems -- many are minor and I have patched them up accordingly, but I am
currently having an issue with debian claiming it can't find the
sphinxcontrib-jquery extension:
https://gitlab.com/jsnow/qemu/-/jobs/10257469021
It might be the case that we need to install the dependencies too, but that
might pose problems for offline source distributions. I haven't fixed this
yet, but I will continue looking into it.
Thanks,
--js
