diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f953262f58..fb6e4a396d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -54,8 +54,6 @@ jobs: image: ${{ matrix.container }} steps: - uses: actions/checkout@v4 - with: - ref: 'main' - name: Install Python dependencies run: | @@ -89,11 +87,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - ref: 'main' - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' cache: 'pip' - name: Install Python dependencies @@ -106,7 +103,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 diff --git a/conf.py b/conf.py index 60c53ea848..8e63824f97 100644 --- a/conf.py +++ b/conf.py @@ -251,6 +251,16 @@ 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):