Skip to content

Commit

Permalink
Backport docs CI fixes from main (#861)
Browse files Browse the repository at this point in the history
* Ignore MoveIt and MoveIt Core Packages from docs Imports (#859)

* Manually copy entire Python bindings docs folder instead of just `api.html` (#860)

* Use main branch to build humble

* Formatting

---------

Co-authored-by: Erik Holum <erik.holum@picknik.ai>
  • Loading branch information
sea-bass and Erik Holum authored Jan 17, 2024
1 parent 68be75b commit 2b8f9b4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.10'
cache: 'pip'

- name: Install Python dependencies
Expand All @@ -106,7 +106,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3'

# TODO (peterdavidfagan): don't hardcode branches for downloads
- name: Download Rolling Artifacts
Expand Down Expand Up @@ -139,9 +139,9 @@ jobs:
# TODO(henningkayser): fix hack for using python api artifact in multiversion
- name: Build multiversion
run: |
cp build/html/main/doc/api/python_api/api.html . # backup artifact html
cp -r build/html/main/doc/api/python_api/ . # backup artifact html
make multiversion
cp -f api.html build/html/main/doc/api/python_api/ # restore artifact html
cp -rf python_api/ build/html/main/doc/api/ # restore artifact html
- name: Upload pages artifact
uses: actions/upload-pages-artifact@v2
Expand Down
11 changes: 11 additions & 0 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,17 @@
doxylink = {"cpp_api": ("build/html/api/MoveIt.tag", "api/html")}
add_function_parentheses = True

# Needed to support previous versions that did not include python bindings
try:
import moveit
except Exception as e:
autodoc_mock_imports = [
"moveit",
"moveit.core",
"moveit.planning",
"moveit.servo_client",
]


class RedirectFrom(Directive):

Expand Down

0 comments on commit 2b8f9b4

Please sign in to comment.