From 558cd55b63892b217f7d2eb95f41c639f389f971 Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 16:29:06 -0500
Subject: [PATCH 1/2] Ignore MoveIt and MoveIt Core Packages from docs Imports
 (#859)

---
 .github/workflows/deploy.yml |  7 ++-----
 conf.py                      | 10 ++++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c7e00c8dae..b0e30a0eeb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -56,8 +56,6 @@ jobs:
       image: ${{ matrix.container }}
     steps:
     - uses: actions/checkout@v4
-      with:
-        ref: 'main'
 
     - name: Install Python dependencies
       run: |
@@ -91,11 +89,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
@@ -108,7 +105,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 3d945b4e6d..2ca1a9ad12 100644
--- a/conf.py
+++ b/conf.py
@@ -254,6 +254,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",
+    ]
 
 autodoc_typehints = "signature"
 

From ca02877e650659f9dc941697f88e75623cc32137 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com>
Date: Tue, 16 Jan 2024 17:53:42 -0500
Subject: [PATCH 2/2] Manually copy entire Python bindings docs folder instead
 of just `api.html` (#860)

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b0e30a0eeb..f799d1762b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -138,9 +138,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@v3