From d6d7e2a8e005b7423f56f3e06367d5045d24a86d Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 10 Jul 2023 16:43:41 -0700 Subject: [PATCH 1/3] scripts/requirements*.txt: pillow<10 to avoid warning On July 1st, python library "Pillow" (needed by sphinxcontrib.blockdiag) released version 10.0.0 https://pypi.org/project/Pillow/#history The sof-docs build immediately started to fail with the warning "'ImageDraw' object has no attribute 'textsize'" Stick to pillow<10 for now to avoid the warning. More details in issue https://github.com/thesofproject/sof-docs/issues/472 Signed-off-by: Marc Herbert --- scripts/requirements-lax.txt | 5 +++++ scripts/requirements.txt | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/scripts/requirements-lax.txt b/scripts/requirements-lax.txt index 7287ddf0..b92ef6c4 100644 --- a/scripts/requirements-lax.txt +++ b/scripts/requirements-lax.txt @@ -58,3 +58,8 @@ sphinxcontrib.plantuml>=0.11,<0.25 # - Downgrade if successfully tested. # - Test with plantum set to "none" in conf.py. We don't want small # typo fixes to depend on UML diagrams. + +# Workaround for warning "'ImageDraw' object has no attribute 'textsize'" +# with pillow 10.0.0, see +# https://github.com/thesofproject/sof-docs/issues/472 +pillow<10 diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 3d50863c..c3697fe8 100755 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -6,3 +6,9 @@ docutils==0.17.1 sphinx_rtd_theme sphinxcontrib-plantuml sphinxcontrib-blockdiag + + +# Workaround for warning "'ImageDraw' object has no attribute 'textsize'" +# with pillow 10.0.0, see +# https://github.com/thesofproject/sof-docs/issues/472 +pillow<10 From ad480edc4101b374caa0301855391b480d8244ae Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 10 Jul 2023 16:45:15 -0700 Subject: [PATCH 2/3] scripts/requirements-lax.txt: align with more recent requirements.txt No point accepting versions older than the officially supported versions. Fixes commit 0d8991b4114f ("Update req.txt file, update copyright, change release number") Signed-off-by: Marc Herbert --- scripts/requirements-lax.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/requirements-lax.txt b/scripts/requirements-lax.txt index b92ef6c4..fb60b139 100644 --- a/scripts/requirements-lax.txt +++ b/scripts/requirements-lax.txt @@ -9,9 +9,9 @@ # PIP_IGNORE_INSTALLED=0 pip3 install --user -r scripts/requirements-lax.txt # See https://github.com/pypa/pip/issues/4222 -breathe>=4.7.3 -sphinx>=1.6.7 -docutils>=0.14 +breathe>=4.29.2 +sphinx>=4.5.0 +docutils>=0.17.1 sphinx_rtd_theme>=0.2.4 sphinxcontrib-blockdiag>=3.0.0 @@ -19,16 +19,13 @@ sphinxcontrib-blockdiag>=3.0.0 # `plantuml_output_format=none` which is required for instant builds. # https://pypi.org/project/sphinxcontrib-plantuml/0.11/ # -# - 0.24 is the last version successfully tested with -# PIP_IGNORE_INSTALLED=0 and Ubuntu 20.04 (see .github/worflows/) -# # - Note 0.9 is the minimum to fix this fatal import failure: # # sphinx.util.compat.Directive class is now deprecated. Please # use instead docutils.parsers.rst.Directive # # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=896485#12 -sphinxcontrib.plantuml>=0.11,<0.25 +sphinxcontrib.plantuml>=0.11 # Differences between these "lax" version requirements and the official # ones in requirements.txt: From 6ca7e568e20100e8074557be7111e84979da0f8b Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 10 Jul 2023 16:46:55 -0700 Subject: [PATCH 3/3] .github: upgrade "lax" build from Ubuntu 20.04 to 22.04 Ubuntu 20.04 is old, we don't want to hear about it. Signed-off-by: Marc Herbert --- .github/workflows/pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index f10d87ff..6586ba61 100755 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -32,7 +32,7 @@ jobs: supported-reqs: name: 'Supported scripts/requirements.txt' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -81,7 +81,7 @@ jobs: deploy: needs: supported-reqs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/publish' }} steps: # download the build result from the same workflow