Sphinx dependency conflict fix (#740) (#745)

pablogs9 · Geibinger · web-flow · commit fc7571bceeb7 · 2024-10-16T10:24:52.000+02:00
Signed-off-by: Geibinger <friedl.jak@gmail.com> (cherry picked from commit 96ab3c1) Co-authored-by: Jakob Friedl <64070660+Geibinger@users.noreply.github.com>
diff --git a/NOTICE b/NOTICE
@@ -25,6 +25,8 @@ eProsima
     Jose Antonio Moral <joseantoniomoralparras@eprosima.com>
     Pablo Garrido <pablogarrido@eprosima.com>
 
+Jakob Friedl <friedl.jak@gmail.com>
+
 Robert Bosch GmbH
     Ingo Lütkebohle  <ingo.luetkebohle@de.bosch.com>
     Ralph Lange <ralph.lange@de.bosch.com>
diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh
@@ -79,6 +79,6 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/ros2_tracing/lttngpy/COLCON_IGNORE
 
     # Upgrade sphinx
-    pip install --force-reinstall Sphinx==4.2.0
+    pip install --force-reinstall docutils==0.16 Sphinx==4.2.0
 
 popd >/dev/null

-Original file line number
+Diff line change
     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]>