From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, Akihiko Odaki <akihiko.odaki@daynix.com>,
John Snow <jsnow@redhat.com>, Thomas Huth <thuth@redhat.com>
Subject: [PULL 4/6] docs: Bump sphinx to 6.2.1
Date: Wed, 16 Jul 2025 19:25:33 +0200 [thread overview]
Message-ID: <20250716172535.3520175-5-armbru@redhat.com> (raw)
In-Reply-To: <20250716172535.3520175-1-armbru@redhat.com>
From: Akihiko Odaki <akihiko.odaki@daynix.com>
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.
(jsnow note: this patch bumps the recommended version for Sphinx to
install when it is missing, but allows old versions to be used if they
are present and functional. The version used for building docs on
readthedocs is pinned to the recommended version, 6.2.1.)
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-ID: <20250715212848.171879-2-jsnow@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
docs/requirements.txt | 4 ++--
pythondeps.toml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 02583f209a..87f7afcb2e 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
# Used by readthedocs.io
# Should be in sync with the "installed" key of pythondeps.toml
-sphinx==5.3.0
-sphinx_rtd_theme==1.1.1
+sphinx==6.2.1
+sphinx_rtd_theme==1.2.2
diff --git a/pythondeps.toml b/pythondeps.toml
index 7884ab521d..b2eec940ce 100644
--- a/pythondeps.toml
+++ b/pythondeps.toml
@@ -24,8 +24,8 @@ pycotap = { accepted = ">=1.1.0", installed = "1.3.1" }
[docs]
# Please keep the installed versions in sync with docs/requirements.txt
-sphinx = { accepted = ">=3.4.3", installed = "5.3.0", canary = "sphinx-build" }
-sphinx_rtd_theme = { accepted = ">=0.5", installed = "1.1.1" }
+sphinx = { accepted = ">=3.4.3", installed = "6.2.1", canary = "sphinx-build" }
+sphinx_rtd_theme = { accepted = ">=0.5", installed = "1.2.2" }
[testdeps]
qemu.qmp = { accepted = ">=0.0.3", installed = "0.0.3" }
--
2.49.0
next prev parent reply other threads:[~2025-07-16 17:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 17:25 [PULL 0/6] QAPI patches patches for 2025-07-16 Markus Armbruster
2025-07-16 17:25 ` [PULL 1/6] qom: qom-list-get Markus Armbruster
2025-07-16 17:25 ` [PULL 2/6] python: use qom-list-get Markus Armbruster
2025-07-16 17:25 ` [PULL 3/6] tests/qtest/qom-test: unit test for qom-list-get Markus Armbruster
2025-07-16 17:25 ` Markus Armbruster [this message]
2025-07-16 17:25 ` [PULL 5/6] MAINTAINERS: Add docs/requirements.txt Markus Armbruster
2025-07-16 17:25 ` [PULL 6/6] python: fix editable installs for modern pip/setuptools Markus Armbruster
2025-07-17 20:56 ` [PULL 0/6] QAPI patches patches for 2025-07-16 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250716172535.3520175-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=akihiko.odaki@daynix.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.