Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1051144?usp=email )

Change subject: Revert "[dep] Update Pillow requirements" ......................................................................

Revert "[dep] Update Pillow requirements"

This reverts commit d3e73bc788844ddf7544d72bb340e6c6cff1e4c5.

Reason for revert: solved upstream with Pillow 10.4

Bug: T364840 Change-Id: Icb69d8fa1f06aa952c073deb63fec933ca36edaa --- M requirements.txt M setup.py 2 files changed, 5 insertions(+), 1 deletion(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/requirements.txt b/requirements.txt index 5da319c..072cf75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,6 +41,7 @@

# GUI Pillow >= 8.1.2, != 10.0, != 10.1 ; python_version < '3.13' +Pillow >= 10.4 ; python_version >= '3.13'

# core pagegenerators google >= 1.7 diff --git a/setup.py b/setup.py index 010e333..b81b241 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,10 @@ 'wikitextparser': ['wikitextparser>=0.47.0'], 'mysql': ['PyMySQL >= 1.0.0'], # vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1 - 'Tkinter': ['Pillow>=8.1.2, != 10.0, != 10.1; python_version < "3.13"'], + 'Tkinter': [ + 'Pillow>=8.1.2, != 10.0, != 10.1; python_version < "3.13"', + 'Pillow>=10.4; python_version >= "3.13"', + ], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], 'html': ['beautifulsoup4>=4.7.1'], 'http': ['fake-useragent>=1.4.0'],