Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround for warning "'ImageDraw' object has no attribute 'textsize'" with pillow 10.0.0 #473

Merged
merged 3 commits into from
Jul 11, 2023
Merged

Workaround for warning "'ImageDraw' object has no attribute 'textsize'" with pillow 10.0.0 #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6d7e2a
scripts/requirements*.txt: pillow<10 to avoid warning
marc-hb Jul 10, 2023
ad480ed
scripts/requirements-lax.txt: align with more recent requirements.txt
marc-hb Jul 10, 2023
6ca7e56
.github: upgrade "lax" build from Ubuntu 20.04 to 22.04
marc-hb Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions scripts/requirements-lax.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,23 @@
# 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

# - Version 0.11 is the first version that supports
# `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:
Expand Down Expand Up @@ -58,3 +55,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
6 changes: 6 additions & 0 deletions scripts/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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