Merge branch 'master' into publish

thesofproject · Mar 27, 2024 · d7a3204 · d7a3204
2 parents dea7da8 + 3c8c515
commit d7a3204
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 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
@@ -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
@@ -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
@@ -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