Sphinx dependency conflict fix (#740)

Signed-off-by: Geibinger <[email protected]> (cherry picked from commit 96ab3c1) # Conflicts: # config/zephyr/generic/create.sh
micro-ROS · Oct 16, 2024 · 18e23b0 · 18e23b0
1 parent a146e83
commit 18e23b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/NOTICE b/NOTICE
@@ -25,6 +25,8 @@ eProsima
     Jose Antonio Moral <[email protected]>
     Pablo Garrido <[email protected]>
 
+Jakob Friedl <[email protected]>
+
 Robert Bosch GmbH
     Ingo Lütkebohle  <[email protected]>
     Ralph Lange <[email protected]>

diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh
@@ -72,6 +72,10 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/ros2_tracing/lttngpy/COLCON_IGNORE
 
     # Upgrade sphinx
+<<<<<<< HEAD
     pip install --force-reinstall Sphinx==4.2.0 --break-system-packages
+=======
+    pip install --force-reinstall docutils==0.16 Sphinx==4.2.0
+>>>>>>> 96ab3c1 (Sphinx dependency conflict fix (#740))
 
 popd >/dev/null