From 346658c6517063dfdeffa6994be6f8ce42fbe40c Mon Sep 17 00:00:00 2001 From: Michael Ferguson Date: Wed, 13 Mar 2024 15:38:13 -0400 Subject: [PATCH] Experimentally try Sphinx 7 --- Signed-off-by: Michael Ferguson --- doc/rst/conf.py | 1 + third-party/chpl-venv/chpldoc-requirements1.txt | 2 +- third-party/chpl-venv/chpldoc-requirements2.txt | 6 +++--- third-party/chpl-venv/chpldoc-requirements3.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/rst/conf.py b/doc/rst/conf.py index 64ecc5c29d0b..a6e3db0c76b9 100644 --- a/doc/rst/conf.py +++ b/doc/rst/conf.py @@ -33,6 +33,7 @@ # ones. extensions = [ 'sphinx.ext.todo', + 'sphinxcontrib.jquery', 'sphinxcontrib.chapeldomain', 'sphinx.ext.mathjax', 'util.disguise', diff --git a/third-party/chpl-venv/chpldoc-requirements1.txt b/third-party/chpl-venv/chpldoc-requirements1.txt index 22a0ad2f3141..265423f39f9c 100644 --- a/third-party/chpl-venv/chpldoc-requirements1.txt +++ b/third-party/chpl-venv/chpldoc-requirements1.txt @@ -1,2 +1,2 @@ # Split into 3 files to work around problems with CHPL_PIP_FROM_SOURCE -MarkupSafe==2.1.3 +MarkupSafe==2.1.5 diff --git a/third-party/chpl-venv/chpldoc-requirements2.txt b/third-party/chpl-venv/chpldoc-requirements2.txt index fd0683b50951..7583018d1fc6 100644 --- a/third-party/chpl-venv/chpldoc-requirements2.txt +++ b/third-party/chpl-venv/chpldoc-requirements2.txt @@ -1,7 +1,7 @@ # Split into 3 files to work around problems with CHPL_PIP_FROM_SOURCE Jinja2==3.1.3 Pygments==2.17.2 -Sphinx==5.3.0 -urllib3==2.1.0 -docutils==0.18 +Sphinx==7.2.6 +urllib3==2.2.1 +docutils==0.20.1 babel==2.14.0 diff --git a/third-party/chpl-venv/chpldoc-requirements3.txt b/third-party/chpl-venv/chpldoc-requirements3.txt index 3b6843c0c5dc..6bbcc3dfb14d 100644 --- a/third-party/chpl-venv/chpldoc-requirements3.txt +++ b/third-party/chpl-venv/chpldoc-requirements3.txt @@ -1,4 +1,4 @@ # Split into 3 files to work around problems with CHPL_PIP_FROM_SOURCE sphinx-rtd-theme==2.0.0 -sphinxcontrib-chapeldomain==0.0.31 +./sphinxcontrib-chapeldomain breathe==4.35.0