From 7e68d936adccf855088e6a20dcaa6d09670c7e2c Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Sat, 24 Feb 2024 00:59:57 +0000 Subject: [PATCH] Add FIXMEs to stop using blockdiag as it is orphaned See #472 for details. Signed-off-by: Marc Herbert --- .../mpp_layer/images/mpp_scheduling/edf_scheduling.diag | 3 +++ conf.py | 4 ++++ scripts/requirements.txt | 7 +++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/architectures/firmware/sof-zephyr/mpp_layer/images/mpp_scheduling/edf_scheduling.diag b/architectures/firmware/sof-zephyr/mpp_layer/images/mpp_scheduling/edf_scheduling.diag index 46a3e974..b9680b22 100644 --- a/architectures/firmware/sof-zephyr/mpp_layer/images/mpp_scheduling/edf_scheduling.diag +++ b/architectures/firmware/sof-zephyr/mpp_layer/images/mpp_scheduling/edf_scheduling.diag @@ -1,3 +1,6 @@ +// FIXME: blockdiag is orphaned and not compatible with Pillow anymore: +// https://github.com/blockdiag/blockdiag/pull/171 + blockdiag edf_scheduling { node_width = 250; diff --git a/conf.py b/conf.py index 6d799d6a..d7b075d7 100755 --- a/conf.py +++ b/conf.py @@ -30,6 +30,10 @@ # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. + + +# FIXME: blockdiag is orphaned and not compatible with Pillow anymore: +# https://github.com/thesofproject/sof-docs/issues/472 extensions = ['breathe', 'sphinx.ext.graphviz', 'sphinxcontrib.plantuml', 'sphinx.ext.todo', 'sphinx.ext.extlinks', 'sphinxcontrib.blockdiag' ] diff --git a/scripts/requirements.txt b/scripts/requirements.txt index e7e9c5b6..17aff9e6 100755 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -6,11 +6,10 @@ breathe docutils sphinx_rtd_theme sphinxcontrib-plantuml -sphinxcontrib-blockdiag sphinxcontrib-applehelp -# Workaround for warning "'ImageDraw' object has no attribute 'textsize'" -# with pillow 10.0.0, see -# https://github.com/thesofproject/sof-docs/issues/472 +# blockdiag is orphaned and not compatible with pillow>=10, +# see https://github.com/thesofproject/sof-docs/issues/472 +sphinxcontrib-blockdiag pillow<10