From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Mauro Carvalho Chehab" <mchehab+huawei@kernel.org>,
"Fabiano Rosas" <farosas@suse.de>,
qemu-block@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Kyle Evans" <kevans@freebsd.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Pierrick Bouvier" <pierrick.bouvier@oss.qualcomm.com>,
"Maksim Davydov" <davydov-max@yandex-team.ru>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Ed Maste" <emaste@freebsd.org>,
"Kohei Tokunaga" <ktokunaga.mail@gmail.com>,
"Thomas Huth" <thuth@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@mailo.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Yonggang Luo" <luoyonggang@gmail.com>,
"Warner Losh" <imp@bsdimp.com>,
"Reinoud Zandijk" <reinoud@netbsd.org>,
"John Snow" <jsnow@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>, "Li-Wen Hsu" <lwhsu@freebsd.org>,
"Peter Xu" <peterx@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 14/16] sphinx: require sphinx 7.2.6
Date: Wed, 2 Sep 2026 15:35:49 -0400 [thread overview]
Message-ID: <20260902193551.582660-15-jsnow@redhat.com> (raw)
In-Reply-To: <20260902193551.582660-1-jsnow@redhat.com>
Make the extraordinary leap from Sphinx 3.4.3 to Sphinx
7.2.6. Simplifications and cleanup will follow in subsequent patches.
Note that CentOS Stream 9 only ships a version of Sphinx that runs on
Python 3.9, so regardless of the version of Sphinx we require, if we
require Python 3.10+, CentOS Stream 9 will be unable to build QEMU
documentation in an isolated offline build environment.
CentOS Stream 9 continues to be able to build documentation so long as
PyPI access is permitted during configure, or if the requisite PyPI
packages are installed prior to configure time.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20260825215851.1780608-15-jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
docs/conf.py | 4 ++--
docs/requirements.txt | 2 +-
python/setup.cfg | 2 +-
python/tests/minreqs.txt | 29 ++++++++++++++++-------------
pythondeps.toml | 4 ++--
5 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 7e35d2158d3..cded047b539 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
# If your documentation needs a minimal Sphinx version, state it here.
#
-# 3.4.3 is the oldest version of Sphinx that ships on a platform we
+# 7.2.6 is the oldest version of Sphinx that ships on a platform we
# pledge build support for.
-needs_sphinx = '3.4.3'
+needs_sphinx = '7.2.6'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 87f7afcb2e7..c10c4cf7c91 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==6.2.1
+sphinx==7.2.6
sphinx_rtd_theme==1.2.2
diff --git a/python/setup.cfg b/python/setup.cfg
index ebb4230899c..927f72a46f6 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -41,7 +41,7 @@ devel =
pylint >= 2.17.3
pytest >= 6.2.4
tox >= 3.18.0
- sphinx >= 3.4.3
+ sphinx >= 7.2.6
# Provides qom-fuse functionality
fuse =
diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt
index 85cfa08cf76..7154ad40040 100644
--- a/python/tests/minreqs.txt
+++ b/python/tests/minreqs.txt
@@ -12,7 +12,7 @@
# on PyPI that allows the test suite to pass.
# Dependencies for qapidoc/qapi_domain et al
-sphinx==3.4.3
+sphinx==7.2.6
# Dependencies for qemu.machine
qemu.qmp==0.0.6
@@ -48,23 +48,26 @@ platformdirs==2.2.0
tomlkit==0.10.1
# Transitive sphinx dependencies
-Jinja2==2.7
-MarkupSafe==1.1.0
alabaster==0.7.1
-babel==1.3
-docutils==0.12
-imagesize==0.5.0
-packaging==14.0
-Pygments==2.0
-pytz==2014.9
-requests==2.5.0
-snowballstemmer==1.1
+babel==2.9
+certifi==2023.5.7
+charset-normalizer==2.0.0
+docutils==0.18.1
+idna==2.5
+imagesize==1.3
+Jinja2==3.0.0
+MarkupSafe==2.0
+packaging==21.0
+Pygments==2.14
+requests==2.25.0
+snowballstemmer==2.0
sphinxcontrib-applehelp==1.0.0
sphinxcontrib-devhelp==1.0.0
-sphinxcontrib-htmlhelp==1.0.0
+sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-jsmath==1.0.0
sphinxcontrib-qthelp==1.0.0
-sphinxcontrib-serializinghtml==1.0.0
+sphinxcontrib-serializinghtml==1.1.9
+urllib3==1.26
# Transitive pytest dependencies
attrs==19.2.0
diff --git a/pythondeps.toml b/pythondeps.toml
index b1879c1a4da..f0f3af915a1 100644
--- a/pythondeps.toml
+++ b/pythondeps.toml
@@ -28,8 +28,8 @@ meson = { accepted = ">=1.12.0", installed = "1.12.0", canary = "meson" }
[docs]
# Please keep the installed versions in sync with docs/requirements.txt
-sphinx = { accepted = ">=3.4.3", installed = "6.2.1", canary = "sphinx-build" }
-sphinx_rtd_theme = { accepted = ">=0.5", installed = "1.2.2" }
+sphinx = { accepted = ">=7.2.6", installed = "7.2.6", canary = "sphinx-build" }
+sphinx_rtd_theme = { accepted = ">=1.2.2", installed = "1.2.2" }
# This test group is for dependencies required to run various tooling
# and tests that should always be installed at configure time. It should
--
2.55.0
next prev parent reply other threads:[~2026-09-02 19:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-02 19:35 [PULL 00/16] Python patches John Snow
2026-09-02 19:35 ` [PULL 01/16] tests: update vm tests to prefer locally-built QEMU John Snow
2026-09-02 19:35 ` [PULL 02/16] tests: update libvirt-ci, lcitool John Snow
2026-09-02 19:35 ` [PULL 03/16] tests: update netbsd dependencies John Snow
2026-09-02 19:35 ` [PULL 04/16] tests: drop python3-devel mapping John Snow
2026-09-02 19:35 ` [PULL 05/16] tests: re-add opencv2 and numpy dependencies John Snow
2026-09-02 19:35 ` [PULL 06/16] tests: add Python3.12 to centos9.docker John Snow
2026-09-02 19:35 ` [PULL 07/16] tests: update emsdk-wasm64-cross John Snow
2026-09-02 19:35 ` [PULL 08/16] qapi: update type hint for objects_seen John Snow
2026-09-02 19:35 ` [PULL 09/16] python: upgrade to Python3.12+ John Snow
2026-09-02 19:35 ` [PULL 10/16] python: fix license configuration John Snow
2026-09-02 19:35 ` [PULL 11/16] python: allow mypy to run as the current python version John Snow
2026-09-02 19:35 ` [PULL 12/16] python: remove distutils workarounds John Snow
2026-09-02 19:35 ` [PULL 13/16] python: remove stale setup.cfg options John Snow
2026-09-02 19:35 ` John Snow [this message]
2026-09-07 12:07 ` [PULL 14/16] sphinx: require sphinx 7.2.6 Mark Cave-Ayland
2026-09-07 13:13 ` Peter Maydell
2026-09-02 19:35 ` [PULL 15/16] sphinx: drop fakedbusdoc John Snow
2026-09-02 19:35 ` [PULL 16/16] sphinx: drop qapidoc back-compat overboiled spaghetti dinner John Snow
2026-09-02 19:40 ` [PULL 00/16] Python patches John Snow
2026-09-03 15:43 ` Peter Maydell
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=20260902193551.582660-15-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=davydov-max@yandex-team.ru \
--cc=emaste@freebsd.org \
--cc=farosas@suse.de \
--cc=hreitz@redhat.com \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=ktokunaga.mail@gmail.com \
--cc=kwolf@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=lwhsu@freebsd.org \
--cc=marcandre.lureau@redhat.com \
--cc=mchehab+huawei@kernel.org \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=philmd@mailo.com \
--cc=pierrick.bouvier@oss.qualcomm.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=reinoud@netbsd.org \
--cc=thuth@redhat.com \
--cc=vsementsov@yandex-team.ru \
/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.