From 835f127dc1d955316529732c4c9c9ffe80faa312 Mon Sep 17 00:00:00 2001 From: mmcky <mmcky@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:44:49 +1100 Subject: [PATCH] MAINT: Upgrade to sphinx-jupyterbook-latex~=0.4.6 (#1538) * MAINT: Upgrade to sphinx-jupyterbook-latex~=0.4.6 * restrict rtd to sphinx<=4.2 * pin to sphinx==4.2 * fix yml formatting * reconfigure rtd to use docs/requirements.txt * use install settings (as before) in readthedocs.yml * update sphinx4 fixtures for pydata-sphinx-theme and sphinx>=4.3 (latest release) * pydata-sphinx-theme is now updated * fix indendation --- .readthedocs.yml | 8 ++++---- setup.cfg | 2 +- .../_toc_numbered_depth_parts_subset.sphinx4.html | 6 +++--- tests/test_build/_toc_numbered_parts.sphinx4.html | 4 ++-- tests/test_build/_toc_numbered_parts_subset.sphinx4.html | 6 +++--- ...pth_parts_subset_multitoc_numbering_false.sphinx4.html | 6 +++--- ...c_numbered_parts_multitoc_numbering_false.sphinx4.html | 4 ++-- ...red_parts_subset_multitoc_numbering_false.sphinx4.html | 6 +++--- .../test_toc_parts_directive.sphinx4.html | 2 +- .../test_tocdirective/test_toc_parts_sidebar.sphinx4.html | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 3a6b083b..f6efbc6e 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,10 +3,10 @@ version: 2 python: version: "3.8" install: - - method: pip - path: . - extra_requirements: - - sphinx + - method: pip + path: . + extra_requirements: + - sphinx sphinx: builder: html diff --git a/setup.cfg b/setup.cfg index 5e999165..728f76f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,7 +47,7 @@ install_requires = sphinx-comments sphinx-copybutton sphinx-external-toc~=0.2.3 - sphinx-jupyterbook-latex~=0.4.3 + sphinx-jupyterbook-latex~=0.4.6 sphinx-panels~=0.6.0 sphinx-thebe~=0.0.10 sphinx_book_theme~=0.1.4 diff --git a/tests/test_build/_toc_numbered_depth_parts_subset.sphinx4.html b/tests/test_build/_toc_numbered_depth_parts_subset.sphinx4.html index daf9bcbc..fadc0159 100644 --- a/tests/test_build/_toc_numbered_depth_parts_subset.sphinx4.html +++ b/tests/test_build/_toc_numbered_depth_parts_subset.sphinx4.html @@ -7,7 +7,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 1 </span> @@ -19,7 +19,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 2 </span> @@ -36,7 +36,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 3 </span> diff --git a/tests/test_build/_toc_numbered_parts.sphinx4.html b/tests/test_build/_toc_numbered_parts.sphinx4.html index 202f3dfc..677dc606 100644 --- a/tests/test_build/_toc_numbered_parts.sphinx4.html +++ b/tests/test_build/_toc_numbered_parts.sphinx4.html @@ -7,7 +7,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 1 </span> @@ -37,7 +37,7 @@ </input> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 2 </span> diff --git a/tests/test_build/_toc_numbered_parts_subset.sphinx4.html b/tests/test_build/_toc_numbered_parts_subset.sphinx4.html index dc255084..85b04f8d 100644 --- a/tests/test_build/_toc_numbered_parts_subset.sphinx4.html +++ b/tests/test_build/_toc_numbered_parts_subset.sphinx4.html @@ -7,7 +7,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 1 </span> @@ -19,7 +19,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 2 </span> @@ -36,7 +36,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 3 </span> diff --git a/tests/test_sphinx_multitoc_numbering/_toc_numbered_depth_parts_subset_multitoc_numbering_false.sphinx4.html b/tests/test_sphinx_multitoc_numbering/_toc_numbered_depth_parts_subset_multitoc_numbering_false.sphinx4.html index 0951df44..71078a38 100644 --- a/tests/test_sphinx_multitoc_numbering/_toc_numbered_depth_parts_subset_multitoc_numbering_false.sphinx4.html +++ b/tests/test_sphinx_multitoc_numbering/_toc_numbered_depth_parts_subset_multitoc_numbering_false.sphinx4.html @@ -7,7 +7,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 1 </span> @@ -19,7 +19,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 2 </span> @@ -36,7 +36,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 3 </span> diff --git a/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_multitoc_numbering_false.sphinx4.html b/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_multitoc_numbering_false.sphinx4.html index 7237e8e4..c3dbbc94 100644 --- a/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_multitoc_numbering_false.sphinx4.html +++ b/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_multitoc_numbering_false.sphinx4.html @@ -7,7 +7,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 1 </span> @@ -37,7 +37,7 @@ </input> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 2 </span> diff --git a/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_subset_multitoc_numbering_false.sphinx4.html b/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_subset_multitoc_numbering_false.sphinx4.html index fcd913d6..518f52eb 100644 --- a/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_subset_multitoc_numbering_false.sphinx4.html +++ b/tests/test_sphinx_multitoc_numbering/_toc_numbered_parts_subset_multitoc_numbering_false.sphinx4.html @@ -7,7 +7,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 1 </span> @@ -19,7 +19,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 2 </span> @@ -36,7 +36,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Chapter 3 </span> diff --git a/tests/test_tocdirective/test_toc_parts_directive.sphinx4.html b/tests/test_tocdirective/test_toc_parts_directive.sphinx4.html index f3e57ca5..31040a84 100644 --- a/tests/test_tocdirective/test_toc_parts_directive.sphinx4.html +++ b/tests/test_tocdirective/test_toc_parts_directive.sphinx4.html @@ -1,5 +1,5 @@ <div class="toctree-wrapper compound"> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> A section </span> diff --git a/tests/test_tocdirective/test_toc_parts_sidebar.sphinx4.html b/tests/test_tocdirective/test_toc_parts_sidebar.sphinx4.html index 4c6f704d..6a9c763f 100644 --- a/tests/test_tocdirective/test_toc_parts_sidebar.sphinx4.html +++ b/tests/test_tocdirective/test_toc_parts_sidebar.sphinx4.html @@ -7,7 +7,7 @@ </a> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> A section </span> @@ -32,7 +32,7 @@ </input> </li> </ul> - <p class="caption" role="heading"> + <p aria-level="2" class="caption" role="heading"> <span class="caption-text"> Another section </span> -- GitLab