diff --git a/Sphinxsetup.sh b/Sphinxsetup.sh index 71c4a2b882..2597eeaa9e 100755 --- a/Sphinxsetup.sh +++ b/Sphinxsetup.sh @@ -46,18 +46,18 @@ rm -f get-pip.py # Install sphinx with a specific docutils version # Docutils version is for correct bullet point rendering. Can be rolled forward after theme is updated to >=0.5.1 # See https://stackoverflow.com/a/68685753/2578171 -python3 -m pip install --user --upgrade sphinx==5.1.1 docutils==0.16 +python3 -m pip install --user --upgrade sphinx==7.2.6 docutils # lxml for parameter parsing: python3 -m pip install --user --upgrade lxml # Install sphinx theme from ArduPilot repository -python3 -m pip install --user --upgrade git+https://github.com/ArduPilot/sphinx_rtd_theme.git +python3 -m pip install --user --upgrade git+https://github.com/khancyr/sphinx_rtd_theme.git@update-1.3.0 # and youtube and video plugins: # This command might require a --force option if you have and older extension installed # Rerun Sphinxsetup.sh after doing that -python3 -m pip install --user --upgrade git+https://github.com/ArduPilot/sphinxcontrib-youtube.git +python3 -m pip install --user --upgrade git+https://github.com/khancyr/sphinxcontrib-youtube.git@sync-upstream # and a parser to use getting posts from Discourse (forum) and insert in FrontEnd python3 -m pip install --user --upgrade beautifulsoup4 diff --git a/update.py b/update.py index 74a9e029b7..621dfce456 100755 --- a/update.py +++ b/update.py @@ -781,7 +781,7 @@ def check_imports(): '''check key imports work''' import pkg_resources # package names to check the versions of. Note that these can be different than the string used to import the package - requires = ["sphinx_rtd_theme>=1.0.0", "sphinxcontrib.youtube>=1.2.0", "sphinx==5.1.1", "docutils==0.16"] + requires = ["sphinx_rtd_theme>=1.0.0", "sphinxcontrib.youtube>=1.2.0", "sphinx>=5.1.1", "docutils>=0.16"] for r in requires: debug("Checking for %s" % r) try: