From efb0bc9630fc5998473de3a35af44ad7bf4eeb7e Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Date: Thu, 21 Sep 2023 07:06:36 +0100
Subject: [PATCH] GH-109209: Bump the minimum Sphinx version to 4.2 (GH-109210)
 (cherry picked from commit 712cb173f8e1d02c625a40ae03bba57b0c1c032a)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
---
 .github/workflows/reusable-docs.yml                    |  2 +-
 Doc/conf.py                                            |  2 +-
 Doc/requirements-oldest-sphinx.txt                     | 10 ++++------
 .../2023-09-10-02-39-06.gh-issue-109209.0LBewo.rst     |  1 +
 4 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Documentation/2023-09-10-02-39-06.gh-issue-109209.0LBewo.rst

diff --git a/.github/workflows/reusable-docs.yml b/.github/workflows/reusable-docs.yml
index b434d3dfeb6da6..d0618516bedddf 100644
--- a/.github/workflows/reusable-docs.yml
+++ b/.github/workflows/reusable-docs.yml
@@ -44,7 +44,7 @@ jobs:
     - name: 'Set up Python'
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'  # known to work with Sphinx 3.2
+        python-version: '3.11'  # known to work with Sphinx 4.2
         cache: 'pip'
         cache-dependency-path: 'Doc/requirements-oldest-sphinx.txt'
     - name: 'Install build dependencies'
diff --git a/Doc/conf.py b/Doc/conf.py
index 161a8dec69b5d2..8c92799ecbbf3b 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -61,7 +61,7 @@
 highlight_language = 'python3'
 
 # Minimum version of sphinx required
-needs_sphinx = '3.2'
+needs_sphinx = '4.2'
 
 # Ignore any .rst files in the includes/ directory;
 # they're embedded in pages but not rendered individually.
diff --git a/Doc/requirements-oldest-sphinx.txt b/Doc/requirements-oldest-sphinx.txt
index 94611ca22f09fe..d3ef5bc17650ae 100644
--- a/Doc/requirements-oldest-sphinx.txt
+++ b/Doc/requirements-oldest-sphinx.txt
@@ -7,12 +7,10 @@ blurb
 python-docs-theme>=2022.1
 
 # Generated from:
-#     pip install "Sphinx~=3.2.0" "docutils<0.17" "Jinja2<3" "MarkupSafe<2"
+#     pip install "Sphinx~=4.2.0"
 #     pip freeze
 #
-# Sphinx 3.2 comes from ``needs_sphinx = '3.2'`` in ``Doc/conf.py``.
-# Docutils<0.17, Jinja2<3, and MarkupSafe<2 are additionally specified as
-# Sphinx 3.2 is incompatible with newer releases of these packages.
+# Sphinx 4.2 comes from ``needs_sphinx = '4.2'`` in ``Doc/conf.py``.
 
 alabaster==0.7.13
 Babel==2.12.1
@@ -25,10 +23,10 @@ imagesize==1.4.1
 Jinja2==2.11.3
 MarkupSafe==1.1.1
 packaging==23.1
-Pygments==2.15.1
+Pygments==2.16.1
 requests==2.31.0
 snowballstemmer==2.2.0
-Sphinx==3.2.1
+Sphinx==4.2.0
 sphinxcontrib-applehelp==1.0.4
 sphinxcontrib-devhelp==1.0.2
 sphinxcontrib-htmlhelp==2.0.1
diff --git a/Misc/NEWS.d/next/Documentation/2023-09-10-02-39-06.gh-issue-109209.0LBewo.rst b/Misc/NEWS.d/next/Documentation/2023-09-10-02-39-06.gh-issue-109209.0LBewo.rst
new file mode 100644
index 00000000000000..79cc0b72ec742f
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2023-09-10-02-39-06.gh-issue-109209.0LBewo.rst
@@ -0,0 +1 @@
+The minimum Sphinx version required for the documentation is now 4.2.