From 4370d16aa0375e9312f1e9af20a908b9841ccec0 Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 13:29:36 -0500
Subject: [PATCH 1/7] Ignore MoveIt and MoveIt Core Packages from docs Imports

---
 conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf.py b/conf.py
index 3d945b4e6d..da31dc8588 100644
--- a/conf.py
+++ b/conf.py
@@ -131,6 +131,8 @@
     "_templates",
 ]
 
+autodoc_mock_imports = ["moveit", "moveit.core"]
+
 # smv_tag_whitelist = None
 
 smv_branch_whitelist = r"^(main|humble)$"

From 50ceb4bb591d2d255c03b5b0af1ae29e6ed0dff8 Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 14:35:53 -0500
Subject: [PATCH 2/7] Conditionally import moveit?

---
 conf.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/conf.py b/conf.py
index da31dc8588..301e082945 100644
--- a/conf.py
+++ b/conf.py
@@ -131,8 +131,6 @@
     "_templates",
 ]
 
-autodoc_mock_imports = ["moveit", "moveit.core"]
-
 # smv_tag_whitelist = None
 
 smv_branch_whitelist = r"^(main|humble)$"
@@ -256,6 +254,13 @@
 doxylink = {"cpp_api": ("build/html/api/MoveIt.tag", "api/html")}
 add_function_parentheses = True
 
+try:
+    import moveit
+except Exception as e:
+    autodoc_mock_imports = ["moveit",
+                            "moveit.core",
+                            "moveit.planning",
+                            "moveit.servo_client"]
 
 autodoc_typehints = "signature"
 

From ad20b9cd0d610fd320dba979ba9a24e295f93f41 Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 15:51:10 -0500
Subject: [PATCH 3/7] Bump python and ruby versions

---
 .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 c7e00c8dae..71078534c1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -95,7 +95,7 @@ jobs:
 
     - uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.10'
         cache: 'pip'
 
     - name: Install Python dependencies
@@ -108,7 +108,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

From 3ffb25a44096650040d52e785ec14f6b40af8def Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 15:59:16 -0500
Subject: [PATCH 4/7] Actually run CI with the version branch

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 71078534c1..36c8100ad4 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: |

From f8c3efd4dbc6261e23dab7ebbfcf93f63bd831fb Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 16:07:47 -0500
Subject: [PATCH 5/7] Remove the mocks...

---
 conf.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/conf.py b/conf.py
index 301e082945..94216fa1ce 100644
--- a/conf.py
+++ b/conf.py
@@ -254,14 +254,6 @@
 doxylink = {"cpp_api": ("build/html/api/MoveIt.tag", "api/html")}
 add_function_parentheses = True
 
-try:
-    import moveit
-except Exception as e:
-    autodoc_mock_imports = ["moveit",
-                            "moveit.core",
-                            "moveit.planning",
-                            "moveit.servo_client"]
-
 autodoc_typehints = "signature"
 
 autodoc_default_options = {

From 26616e84c61e4a57343b64d3b5783aafbdab07bd Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 16:11:55 -0500
Subject: [PATCH 6/7] Remove main from collate_site_artifacts

---
 .github/workflows/deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 36c8100ad4..b0e30a0eeb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -89,7 +89,6 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        ref: 'main'
 
     - uses: actions/setup-python@v4
       with:

From 91a7111b2ed16ae8889a00b88a2d0303a4c0f0e6 Mon Sep 17 00:00:00 2001
From: Erik Holum <erik.holum@picknik.ai>
Date: Tue, 16 Jan 2024 16:14:35 -0500
Subject: [PATCH 7/7] Ok mocks are back

---
 conf.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/conf.py b/conf.py
index 94216fa1ce..2ca1a9ad12 100644
--- a/conf.py
+++ b/conf.py
@@ -254,6 +254,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",
+    ]
+
 autodoc_typehints = "signature"
 
 autodoc_default_options = {