Skip to content

Commit

Permalink
[NO MERGE] test updated youtube pluging to pass CI windows
Browse files Browse the repository at this point in the history
  • Loading branch information
khancyr committed Oct 31, 2023
1 parent 3745d55 commit 77d1eb1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Sphinxsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion update.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 77d1eb1

Please sign in to comment.