From fbdf4f05e3f48ef024273b24d02b755cef66e730 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 8 Mar 2025 19:00:08 +0000 Subject: [PATCH 1/3] python: requirements: update Pillow, Sphinx Pillow 11.1 seems to work with Sphinx 8.2. installed via pip. No build errors now. Signed-off-by: Liam Girdwood --- scripts/requirements.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 17aff9e..4990d20 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -1,15 +1,17 @@ # This file hardcodes validated versions with '==', # see requirements-lax.txt for an alternative. -sphinx>=7 +sphinx>=8.2.1 breathe docutils +plantuml sphinx_rtd_theme +sphinxcontrib-jquery sphinxcontrib-plantuml sphinxcontrib-applehelp - -# blockdiag is orphaned and not compatible with pillow>=10, +# blockdiag is orphaned and not compatible with pillow 10, # see https://github.com/thesofproject/sof-docs/issues/472 +# however it is compatible with pillow 11.1 sphinxcontrib-blockdiag -pillow<10 +pillow>=11.1 From ab73b25c12d433b2f0fc75d48c357a34da025a7e Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sun, 9 Mar 2025 08:32:58 +0000 Subject: [PATCH 2/3] github: workflows: update to a more recent Ubuntu 24.04 Update to use more recent tooling for doc generation. Signed-off-by: Liam Girdwood --- .github/workflows/pull-request.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 11b29b3..5a2c78f 100644 --- 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-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 @@ -81,7 +81,7 @@ jobs: deploy: needs: supported-reqs - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/publish' }} steps: # download the build result from the same workflow @@ -102,7 +102,7 @@ jobs: lax: name: "PIP_IGNORE_INSTALLED=0 requirements-lax.txt" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 # Makefile downgrades the Sphinx warnings, they are not errors any more env: {LAX: 1} steps: From 56d9390597f20d04c6c7dc3c5446eef89d83e31b Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Fri, 9 May 2025 13:58:19 +0100 Subject: [PATCH 3/3] github: workflows: update to ubuntu 24.04 Ubuntu 20.04 is out of date and no longer supported. Signed-off-by: Liam Girdwood --- .github/workflows/woke.yml | 2 +- .github/workflows/woke_pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/woke.yml b/.github/workflows/woke.yml index 8338578..86517b0 100755 --- a/.github/workflows/woke.yml +++ b/.github/workflows/woke.yml @@ -17,7 +17,7 @@ on: jobs: woke: name: woke check for all file - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: woke diff --git a/.github/workflows/woke_pr.yml b/.github/workflows/woke_pr.yml index 7aa9708..5f8af97 100755 --- a/.github/workflows/woke_pr.yml +++ b/.github/workflows/woke_pr.yml @@ -19,7 +19,7 @@ on: jobs: woke_pr: name: woke check for patch - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - uses: get-woke/woke-action-reviewdog@v0