]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-109209: Bump the minimum Sphinx version to 4.2 (#109210)
authorAdam Turner <9087854+AA-Turner@users.noreply.github.com>
Thu, 21 Sep 2023 06:06:36 +0000 (07:06 +0100)
committerGitHub <noreply@github.com>
Thu, 21 Sep 2023 06:06:36 +0000 (09:06 +0300)
.github/workflows/reusable-docs.yml
Doc/conf.py
Doc/requirements-oldest-sphinx.txt
Misc/NEWS.d/next/Documentation/2023-09-10-02-39-06.gh-issue-109209.0LBewo.rst [new file with mode: 0644]

index 51efa54e8d1b3d4568e25168a4281868d7a4bd16..1c4fa4239c1e3406a355062c6fc7e577bdf292d1 100644 (file)
@@ -74,7 +74,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'
index 16fd8bf257179e821fc9eab3160c27b292f14ba2..c92ea60ee07094c71c5e8791791cd7cdf98350f9 100644 (file)
@@ -66,7 +66,7 @@ today_fmt = '%B %d, %Y'
 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.
index 94611ca22f09fef48b9b68585668ca6645110e24..d3ef5bc17650aee45500337834e7b8e524057ebb 100644 (file)
@@ -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 (file)
index 0000000..79cc0b7
--- /dev/null
@@ -0,0 +1 @@
+The minimum Sphinx version required for the documentation is now 4.2.