From d521c159fed4a472097be866a33c9f4456d0f342 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 24 Aug 2023 08:41:15 +0100 Subject: [PATCH] docs/sphinx: Manually resolve sphinx deps Signed-off-by: Ryan Northey --- tools/base/requirements.in | 9 ++++++++- tools/base/requirements.txt | 31 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/tools/base/requirements.in b/tools/base/requirements.in index 86532c679c85..c4116f646c0a 100644 --- a/tools/base/requirements.in +++ b/tools/base/requirements.in @@ -33,11 +33,18 @@ pyreadline pyyaml setuptools slackclient -sphinx>=7 +sphinx>=7.2.3 thrift verboselogs yapf yarl>=1.7.2 +# https://github.com/sphinx-doc/sphinx/issues/11567 +sphinxcontrib-applehelp<1.0.5 +sphinxcontrib-devhelp<1.0.3 +sphinxcontrib-htmlhelp<2.0.2 +sphinxcontrib-qthelp<1.0.4 +# sphinxcontrib-serializinghtml<1.1.6 + # This has packaging issues, so use the github tarball until resolved (https://github.com/sphinx-contrib/jquery/issues/15) https://github.com/sphinx-contrib/jquery/archive/refs/tags/v3.0.0.zip diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt index 766da25098f1..935f94e67c7f 100644 --- a/tools/base/requirements.txt +++ b/tools/base/requirements.txt @@ -1206,14 +1206,15 @@ snowballstemmer==2.2.0 \ --hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \ --hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a # via sphinx -sphinx==7.2.2 \ - --hash=sha256:1c0abe6d4de7a6b2c2b109a2e18387bf27b240742e1b34ea42ac3ed2ac99978c \ - --hash=sha256:ed33bc597dd8f05cd37118f64cbac0b8bf773389a628ddfe95ab9e915c9308dc +sphinx==7.2.3 \ + --hash=sha256:6379ea22c49955a44ed4e62bde8c94575e9544303cc0554eaa97099ae5853a3a \ + --hash=sha256:ece68bb4d77b7dc090573825db45a6f9183e74098d1c21573485de250b1d1e3f # via # -r requirements.in # envoy-docs-sphinx-runner # sphinx-copybutton # sphinxcontrib-httpdomain + # sphinxcontrib-serializinghtml # sphinxext-rediraffe sphinx-copybutton==0.5.2 \ --hash=sha256:4cf17c82fb9646d1bc9ca92ac280813a3b605d8c421225fd9913154103ee1fbd \ @@ -1222,20 +1223,26 @@ sphinx-copybutton==0.5.2 \ sphinxcontrib-applehelp==1.0.4 \ --hash=sha256:29d341f67fb0f6f586b23ad80e072c8e6ad0b48417db2bde114a4c9746feb228 \ --hash=sha256:828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e - # via sphinx + # via + # -r requirements.in + # sphinx sphinxcontrib-devhelp==1.0.2 \ --hash=sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e \ --hash=sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4 - # via sphinx + # via + # -r requirements.in + # sphinx sphinxcontrib-htmlhelp==2.0.1 \ --hash=sha256:0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff \ --hash=sha256:c38cb46dccf316c79de6e5515e1770414b797162b23cd3d06e67020e1d2a6903 - # via sphinx + # via + # -r requirements.in + # sphinx sphinxcontrib-httpdomain==1.8.1 \ --hash=sha256:21eefe1270e4d9de8d717cc89ee92cc4871b8736774393bafc5e38a6bb77b1d5 \ --hash=sha256:6c2dfe6ca282d75f66df333869bb0ce7331c01b475db6809ff9d107b7cdfe04b # via envoy-docs-sphinx-runner -sphinxcontrib-jquery @ https://github.com/sphinx-contrib/jquery/archive/refs/tags/v3.0.0.zip \ +sphinxcontrib.jquery @ https://github.com/sphinx-contrib/jquery/archive/refs/tags/v3.0.0.zip \ --hash=sha256:562ad9ac0ac3d8f04a363eb3507ae4b2b856aa04aabab6df7543530fafb849ca # via # -r requirements.in @@ -1247,10 +1254,12 @@ sphinxcontrib-jsmath==1.0.1 \ sphinxcontrib-qthelp==1.0.3 \ --hash=sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72 \ --hash=sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6 - # via sphinx -sphinxcontrib-serializinghtml==1.1.5 \ - --hash=sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd \ - --hash=sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952 + # via + # -r requirements.in + # sphinx +sphinxcontrib-serializinghtml==1.1.9 \ + --hash=sha256:0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54 \ + --hash=sha256:9b36e503703ff04f20e9675771df105e58aa029cfcbc23b8ed716019b7416ae1 # via # envoy-docs-sphinx-runner # sphinx