From 4e4f9d18982bc8fc6d9b6ce980123838bc937b9c Mon Sep 17 00:00:00 2001 From: Bartosz Sokorski Date: Sat, 18 Apr 2026 14:07:56 +0200 Subject: [PATCH 1/3] Infra: bump Sphinx to >=8.2, limit docutils to <0.22 --- Makefile | 1 - .../pep_processor/html/pep_html_builder.py | 2 +- requirements.txt | 7 +++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a9ef1e8238d..46eb3a0cf41 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,6 @@ htmllive: _ensure-sphinx-autobuild html .PHONY: dirhtml dirhtml: BUILDER = dirhtml dirhtml: html - mv $(BUILDDIR)/404/index.html $(BUILDDIR)/404.html ## search to rebuild the search index .PHONY: search diff --git a/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py b/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py index 8f5fe81bcf5..81ec0b455da 100644 --- a/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py +++ b/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py @@ -48,4 +48,4 @@ class DirectoryBuilder(FileBuilder): # sync all overwritten things from DirectoryHTMLBuilder name = DirectoryHTMLBuilder.name get_target_uri = DirectoryHTMLBuilder.get_target_uri - get_outfilename = DirectoryHTMLBuilder.get_outfilename + get_outfilename = DirectoryHTMLBuilder.get_output_path diff --git a/requirements.txt b/requirements.txt index 3e4261af830..e791f576e2c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,10 +3,9 @@ # Sphinx requires >= 2.17. JSON5 support added in 2.19, `lazy` highlight added in 2.21 pygments >= 2.21 -# Sphinx 6.1.0 broke copying images in parallel builds; fixed in 6.1.2 -# See https://github.com/sphinx-doc/sphinx/pull/11100 -Sphinx >= 5.1.1, != 6.1.0, != 6.1.1, < 8.1.0 -docutils >= 0.19.0 +Sphinx >= 8.2 +# 0.22 causes build errors, see https://github.com/python/peps/issues/4924 +docutils < 0.22 sphinx-notfound-page >= 1.0.2 # For search pagefind[bin] >= 1.5.0 From 5eb2860758090f6c02d962c9b66ad9715b1e2959 Mon Sep 17 00:00:00 2001 From: Bartosz Sokorski Date: Mon, 17 Aug 2026 12:25:45 +0200 Subject: [PATCH 2/3] fix dirhtml build --- pep_sphinx_extensions/pep_processor/html/pep_html_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py b/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py index 81ec0b455da..467dd82670c 100644 --- a/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py +++ b/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py @@ -48,4 +48,4 @@ class DirectoryBuilder(FileBuilder): # sync all overwritten things from DirectoryHTMLBuilder name = DirectoryHTMLBuilder.name get_target_uri = DirectoryHTMLBuilder.get_target_uri - get_outfilename = DirectoryHTMLBuilder.get_output_path + get_output_path = DirectoryHTMLBuilder.get_output_path From 38c6d1953ca62a3dc21eff47c517cdb240a6506c Mon Sep 17 00:00:00 2001 From: Bartosz Sokorski Date: Mon, 17 Aug 2026 12:29:06 +0200 Subject: [PATCH 3/3] restore 404.html move --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 46eb3a0cf41..a9ef1e8238d 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ htmllive: _ensure-sphinx-autobuild html .PHONY: dirhtml dirhtml: BUILDER = dirhtml dirhtml: html + mv $(BUILDDIR)/404/index.html $(BUILDDIR)/404.html ## search to rebuild the search index .PHONY: search