From a3b2efcab04d6c3442da64492df5b2d0d4d86ac4 Mon Sep 17 00:00:00 2001 From: hategan Date: Mon, 15 Jan 2024 09:54:09 -0800 Subject: [PATCH 1/4] sphinxcontrib-applehelp 1.0.8 added a requirement for Sphinx 5.0, which breaks Sphinx 4.5 who doesn't pin the dep to something compatible with it. It's even more silly because we don't generate applehelp output. --- requirements-docs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-docs.txt b/requirements-docs.txt index b80ba97a..fb2b6c62 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -11,6 +11,7 @@ Sphinx==4.5.0 sphinx_rtd_theme sphinx-tabs==3.2.0 sphinx-multiversion +sphinxcontrib-applehelp=1.0.7 # For the web version of the docs cloud_sptheme == 1.10.1.post20200504175005 From fcf511c3be680ed66497c5b73f4cac2cc45ef9a5 Mon Sep 17 00:00:00 2001 From: hategan Date: Mon, 15 Jan 2024 10:07:31 -0800 Subject: [PATCH 2/4] oops --- requirements-docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index fb2b6c62..c7397193 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -11,7 +11,7 @@ Sphinx==4.5.0 sphinx_rtd_theme sphinx-tabs==3.2.0 sphinx-multiversion -sphinxcontrib-applehelp=1.0.7 +sphinxcontrib-applehelp==1.0.7 # For the web version of the docs cloud_sptheme == 1.10.1.post20200504175005 From d61c66833406c0e10b27b8b7bab76620000d4132 Mon Sep 17 00:00:00 2001 From: hategan Date: Mon, 15 Jan 2024 10:27:20 -0800 Subject: [PATCH 3/4] Apparently the magic version is 1.0.4 not 1.0.7 --- requirements-docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index c7397193..206da3a6 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -11,7 +11,7 @@ Sphinx==4.5.0 sphinx_rtd_theme sphinx-tabs==3.2.0 sphinx-multiversion -sphinxcontrib-applehelp==1.0.7 +sphinxcontrib-applehelp==1.0.4 # For the web version of the docs cloud_sptheme == 1.10.1.post20200504175005 From 23dcc95c4c5fd309b210d3a18c45a702085a11dc Mon Sep 17 00:00:00 2001 From: hategan Date: Mon, 15 Jan 2024 11:58:25 -0800 Subject: [PATCH 4/4] Turns out we need to pin quite a few more plugins. What exactly changed now (many of these plugins have required 5.0 for years) remains unclear. --- requirements-docs.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/requirements-docs.txt b/requirements-docs.txt index 206da3a6..4da7ced5 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -11,7 +11,15 @@ Sphinx==4.5.0 sphinx_rtd_theme sphinx-tabs==3.2.0 sphinx-multiversion + +# These are not requirements for PSI/J, but we must pin the version +# since Sphinx 4.5.0 does not properly do so and later versions of +# these plugins require Sphinx >= 5.0.0 sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-qthelp==1.0.3 # For the web version of the docs cloud_sptheme == 1.10.1.post20200504175005