From d8bb06121e5ab69078581823c1c73f158cbb8ed5 Mon Sep 17 00:00:00 2001 From: Jakob Friedl <64070660+Geibinger@users.noreply.github.com> Date: Wed, 16 Oct 2024 08:35:06 +0200 Subject: [PATCH] Sphinx dependency conflict fix (#740) Signed-off-by: Geibinger (cherry picked from commit 96ab3c183553becba0cc423e57f123e68da13db4) --- NOTICE | 2 ++ config/zephyr/generic/create.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 17a152ed..47ce6bdc 100644 --- a/NOTICE +++ b/NOTICE @@ -25,6 +25,8 @@ eProsima Jose Antonio Moral Pablo Garrido +Jakob Friedl + Robert Bosch GmbH Ingo Lütkebohle Ralph Lange diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh index 707ded3b..1d58f2a2 100755 --- a/config/zephyr/generic/create.sh +++ b/config/zephyr/generic/create.sh @@ -68,6 +68,6 @@ pushd $FW_TARGETDIR >/dev/null touch mcu_ws/uros/rclc/rclc_examples/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