From 2caa89434eacec03735f8b29b6bb315c97c0e926 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 18 Apr 2024 02:24:07 +0100 Subject: [PATCH 1/4] Fix 404s --- pep_sphinx_extensions/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pep_sphinx_extensions/__init__.py b/pep_sphinx_extensions/__init__.py index 42d3069c952..382d6bd4e5c 100644 --- a/pep_sphinx_extensions/__init__.py +++ b/pep_sphinx_extensions/__init__.py @@ -20,10 +20,6 @@ from sphinx.application import Sphinx -def _depart_maths(): - pass # No-op callable for the type checker - - def _update_config_for_builder(app: Sphinx) -> None: app.env.document_ids = {} # For PEPReferenceRoleTitleText app.env.settings["builder"] = app.builder.name @@ -84,8 +80,8 @@ def setup(app: Sphinx) -> dict[str, bool]: app.connect("env-before-read-docs", create_pep_zero) # PEP 0 hook # Mathematics rendering - inline_maths = HTMLTranslator.visit_math, _depart_maths - block_maths = HTMLTranslator.visit_math_block, _depart_maths + inline_maths = HTMLTranslator.visit_math, None + block_maths = HTMLTranslator.visit_math_block, None app.add_html_math_renderer("maths_to_html", inline_maths, block_maths) # Render maths to HTML # Parallel safety: https://www.sphinx-doc.org/en/master/extdev/index.html#extension-metadata From 8f57b6de57a8956be5129470aa00ba5ac14beee9 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 18 Apr 2024 02:25:03 +0100 Subject: [PATCH 2/4] always deploy --- .github/workflows/render.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/render.yml b/.github/workflows/render.yml index eb9c107b809..ff1c6d49ab2 100644 --- a/.github/workflows/render.yml +++ b/.github/workflows/render.yml @@ -49,8 +49,6 @@ jobs: run: rm -r build/.doctrees/ - name: Deploy to GitHub pages - # This allows CI to build branches for testing - if: (github.ref == 'refs/heads/main') && (matrix.python-version == '3.x') uses: JamesIves/github-pages-deploy-action@v4 with: folder: build # Synchronise with Makefile -> BUILDDIR From 9d43f0665bf6ec3eb5f9e8a6fa520fb2b09feffb Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 18 Apr 2024 02:31:21 +0100 Subject: [PATCH 3/4] Revert "always deploy" This reverts commit 8f57b6de57a8956be5129470aa00ba5ac14beee9. --- .github/workflows/render.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/render.yml b/.github/workflows/render.yml index ff1c6d49ab2..eb9c107b809 100644 --- a/.github/workflows/render.yml +++ b/.github/workflows/render.yml @@ -49,6 +49,8 @@ jobs: run: rm -r build/.doctrees/ - name: Deploy to GitHub pages + # This allows CI to build branches for testing + if: (github.ref == 'refs/heads/main') && (matrix.python-version == '3.x') uses: JamesIves/github-pages-deploy-action@v4 with: folder: build # Synchronise with Makefile -> BUILDDIR From 9d826d1af472a27796e7f74a848b098db2513f70 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:13:15 +0300 Subject: [PATCH 4/4] Revert "Infra: Skip Sphinx 7.3 to fix missing 404s (#3758)" This reverts commit e4dd4dbcb6aee2accc547752388671d22e0edfbb. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5987b780e54..1c716bc5d27 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Pygments >= 2.9.0 # 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, < 7.3 +Sphinx >= 5.1.1, != 6.1.0, != 6.1.1 docutils >= 0.19.0 sphinx-autobuild