From c3c816be6df0282f6c31cd92c01ee0317d3ce97a Mon Sep 17 00:00:00 2001 From: Rob Lemley Date: Tue, 1 Oct 2024 13:53:02 +0300 Subject: [PATCH] Bug 1908528 - Update Sphinx and dependencies. r=dandarnell Differential Revision: https://phabricator.services.mozilla.com/D222386 --HG-- extra : amend_source : 7573dc5ad8fd4cbb76e57b70e67eb7d89a385911 --- .readthedocs.yaml | 2 +- docs/jsdoc.conf.js | 2 ++ docs/requirements.in | 6 +++- docs/requirements.txt | 67 +++++++++++++++++++++++----------------- python/sites/tb_docs.txt | 8 ++++- 5 files changed, 53 insertions(+), 32 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c0a9dd4dee..5a182a407c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,7 +10,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.10" + python: "3.11" nodejs: "20" # You can also specify other tool versions: # rust: "1.55" diff --git a/docs/jsdoc.conf.js b/docs/jsdoc.conf.js index ca7526cf22..5a37e794e0 100644 --- a/docs/jsdoc.conf.js +++ b/docs/jsdoc.conf.js @@ -172,6 +172,8 @@ module.exports = { "../suite", + "../node_modules", + ...ignorePatterns, ], includePattern: ".+\\.m?js(doc)?$", diff --git a/docs/requirements.in b/docs/requirements.in index 22e18ec56e..e8755f1030 100644 --- a/docs/requirements.in +++ b/docs/requirements.in @@ -1,5 +1,9 @@ -Sphinx==7.2.6 +Sphinx==7.4.7 sphinx_rtd_theme==2.0.0 sphinx-js==3.2.2 myst-parser[linkify]==2.0.0 fluent.pygments==1.0 +sphinxcontrib-mermaid==0.9.2 +sphinx-copybutton==0.5.2 +sphinx-markdown-tables==0.0.17 +sphinx-design==0.5.0 diff --git a/docs/requirements.txt b/docs/requirements.txt index 1c92727c92..32a482720e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile requirements.in # -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -babel==2.11.0 +babel==2.16.0 # via sphinx -certifi==2022.12.7 +certifi==2024.8.30 # via requests -charset-normalizer==3.0.1 +charset-normalizer==3.3.2 # via requests docutils==0.20.1 # via @@ -19,19 +19,21 @@ docutils==0.20.1 # sphinx-rtd-theme fluent-pygments==1.0 # via -r requirements.in -fluent-syntax==0.18.1 +fluent-syntax==0.19.0 # via fluent-pygments -idna==3.4 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -jinja2==3.1.2 +jinja2==3.1.4 # via # myst-parser # sphinx # sphinx-js -linkify-it-py==2.0.2 +linkify-it-py==2.0.3 # via myst-parser +markdown==3.7 + # via sphinx-markdown-tables markdown-it-py==3.0.0 # via # mdit-py-plugins @@ -40,61 +42,68 @@ markupsafe==2.0.1 # via # jinja2 # sphinx-js -mdit-py-plugins==0.4.0 +mdit-py-plugins==0.4.2 # via myst-parser mdurl==0.1.2 # via markdown-it-py myst-parser[linkify]==2.0.0 - # via - # -r requirements.in - # myst-parser -packaging==23.0 + # via -r requirements.in +packaging==24.1 # via sphinx parsimonious==0.10.0 # via sphinx-js -pygments==2.14.0 +pygments==2.18.0 # via # fluent-pygments # sphinx -pytz==2022.7 - # via babel -pyyaml==6.0 +pyyaml==6.0.2 # via myst-parser -regex==2023.12.25 +regex==2024.9.11 # via parsimonious -requests==2.28.2 +requests==2.32.3 # via sphinx six==1.16.0 # via fluent-pygments snowballstemmer==2.2.0 # via sphinx -sphinx==7.2.6 +sphinx==7.4.7 # via # -r requirements.in # myst-parser + # sphinx-copybutton + # sphinx-design # sphinx-js # sphinx-rtd-theme # sphinxcontrib-jquery - # sphinxcontrib-serializinghtml +sphinx-copybutton==0.5.2 + # via -r requirements.in +sphinx-design==0.5.0 + # via -r requirements.in sphinx-js==3.2.2 # via -r requirements.in +sphinx-markdown-tables==0.0.17 + # via -r requirements.in sphinx-rtd-theme==2.0.0 # via -r requirements.in -sphinxcontrib-applehelp==1.0.3 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jquery==4.1 # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-mermaid==0.9.2 + # via -r requirements.in +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.9 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -uc-micro-py==1.0.1 +typing-extensions==4.12.2 + # via fluent-syntax +uc-micro-py==1.0.3 # via linkify-it-py -urllib3==1.26.14 +urllib3==2.2.3 # via requests diff --git a/python/sites/tb_docs.txt b/python/sites/tb_docs.txt index abb136f5e9..385c351f32 100644 --- a/python/sites/tb_docs.txt +++ b/python/sites/tb_docs.txt @@ -1,7 +1,13 @@ pth:tools/lint/eslint/ -pypi:Sphinx==7.2.6 +pth:comm/python/rocbuild +pypi:Sphinx==7.4.7 pypi:sphinx_rtd_theme==2.0.0 pypi:sphinx-js==3.2.2 pypi:myst-parser[linkify]==2.0.0 pypi:fluent.pygments==1.0 pypi:livereload==2.6.3 +pypi:mots==0.11.1 +pypi:sphinxcontrib-mermaid==0.9.2 +pypi:sphinx-copybutton==0.5.2 +pypi:sphinx-markdown-tables==0.0.17 +pypi:sphinx-design==0.5.0