Merge branch 'main' into add-pep-790

Author: facundobatista

.github/workflows/render.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         python-version:
         - "3.x"
-        - "3.13-dev"
+        - "3.14-dev"
 
     steps:
       - name: Checkout

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
 
 ## linkcheck      to check validity of links within PEP sources
 .PHONY: linkcheck

pep_sphinx_extensions/pep_theme/templates/page.html

@@ -49,12 +49,12 @@ <h1>Python Enhancement Proposals</h1>
         <article>
             {{ body }}
         </article>
-        {%- if not pagename == "numerical" %}
+        {%- if not pagename.startswith(("404", "numerical")) %}
         <nav id="pep-sidebar">
             <h2>Contents</h2>
             {{ toc }}
             <br>
-            {%- if not pagename.startswith(("numerical", "pep-0000", "topic")) %}
+            {%- if not pagename.startswith(("pep-0000", "topic")) %}
             <a id="source" href="https://github.com/python/peps/blob/main/peps/{{pagename}}.rst">Page Source (GitHub)</a>
             {%- endif %}
         </nav>

peps/conf.py

@@ -19,6 +19,7 @@
 
 # Add any Sphinx extension module names here, as strings.
 extensions = [
+    "notfound.extension",
     "pep_sphinx_extensions",
     "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
@@ -85,6 +86,10 @@
     "pypi": ("https://pypi.org/project/%s/", "%s"),
 }
 
+# sphinx-notfound-page
+# https://sphinx-notfound-page.readthedocs.io/en/latest/faq.html#does-this-extension-work-with-github-pages
+notfound_urls_prefix = None
+
 # -- Options for HTML output -------------------------------------------------
 
 _PSE_PATH = _ROOT / "pep_sphinx_extensions"

requirements.txt

@@ -4,6 +4,7 @@ Pygments >= 2.9.0
 # 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-notfound-page >= 1.0.2
 
 # For tests
 pytest