From 9d8ff71a494654f4c2806aa5884d91130b78c092 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 25 May 2023 20:47:11 +0200 Subject: [PATCH] Elaborate comments Also document the build requirements in Doc/using/configure.rst --- Doc/conf.py | 3 ++- Doc/using/configure.rst | 2 ++ Doc/whatsnew/3.13.rst | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Doc/conf.py b/Doc/conf.py index 8bdda18fab9209..bae624ea236d06 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -65,7 +65,8 @@ # By default, highlight as Python 3. highlight_language = 'python3' -# Minimum version of sphinx required +# Minimum version of sphinx required. +# Sphinx 6.2 no longer uses imghdr which was removed in Python 3.13. needs_sphinx = '6.2' # Ignore any .rst files in the includes/ directory; diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index fbe280d6413170..c284d645c29fe8 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -22,6 +22,8 @@ Features required to build CPython: * On Windows, Microsoft Visual Studio 2017 or later is required. +* Sphinx 6.2 or newer is required to build the Python documentation. + .. versionchanged:: 3.11 C11 compiler, IEEE 754 and NaN support are now required. On Windows, Visual Studio 2017 or later is required. diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst index 175a187de69803..393c88fc8c9b6c 100644 --- a/Doc/whatsnew/3.13.rst +++ b/Doc/whatsnew/3.13.rst @@ -242,6 +242,8 @@ Build Changes ============= * Sphinx 6.2 or newer is now required to build the Python documentation. + Sphinx 6.2 no longer uses the :mod:`!imghdr` module which was removed in + Python 3.13. (Contributed by Victor Stinner in :gh:`104818`.)