From d31fbf25e0a92fa50552997c6992cc9db8a92d93 Mon Sep 17 00:00:00 2001 From: Bartosz Sokorski Date: Sat, 18 Apr 2026 14:07:56 +0200 Subject: [PATCH] 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 acde62e6e25..1225ca4a5d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,10 +5,9 @@ # https://github.com/pygments/pygments/discussions/3145 pygments @ git+https://github.com/pygments/pygments@2cad2642058441b59782a6a18f03c98c42d081f1 -# 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