From 6e98fd8cec49631faacac9b11b5b7f609aa9673d Mon Sep 17 00:00:00 2001 From: xqt Date: Sun, 26 May 2024 13:00:02 +0200 Subject: [PATCH] [dep] Update Pillow requirements Pillow fails with Python 3.14 and 3.14 but a fix was done with https://github.com/python-pillow/Pillow/pull/8050 which will be published in 10.4.0 https://github.com/python-pillow/Pillow/issues/8076 Bug: T364840 Change-Id: Id3080f0e4e5d270c3bd03c56896af3cb61b609b8 --- requirements.txt | 3 ++- setup.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6bdd15f3ae..072cf75a79 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,8 @@ pydot >= 1.4.1 python-stdnum >= 1.19 # GUI -Pillow >= 8.1.2, != 10.0, != 10.1 +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 6190686aca..b81b241a28 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'], + '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'],