Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/936068 )
Change subject: [tests] Don't use Pillow 10 with platform_machine 32
......................................................................
[tests] Don't use Pillow 10 with platform_machine 32
Bug: T341198
Change-Id: Id3705f69db209c5750beb23b9cc13d8712009fab
---
M setup.py
M requirements.txt
2 files changed, 15 insertions(+), 3 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/requirements.txt b/requirements.txt
index 1c7e5ed..379761c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,7 +42,8 @@
python-stdnum >= 1.18
# GUI
-Pillow >= 8.1.1
+Pillow >= 8.1.2, < 10.0.0; platform_machine == 'AMD32'
+Pillow >= 8.1.2; platform_machine != 'AMD32'
# core pagegenerators
google >= 1.7
diff --git a/setup.py b/setup.py
index de00fc5..32c63a0 100755
--- a/setup.py
+++ b/setup.py
@@ -45,8 +45,9 @@
'memento': ['memento_client==0.6.1'],
'wikitextparser': ['wikitextparser>=0.47.0'],
'mysql': ['PyMySQL >= 0.9.3'], # toolforge
- # vulnerability found in Pillow<8.1.1 but toolforge uses 5.4.1
- 'Tkinter': ['Pillow>=8.1.1'],
+ # vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1
+ 'Tkinter': ['Pillow>=8.1.2, < 10.0.0; platform_machine == "AMD32"',
+ 'Pillow>=8.1.2; platform_machine != "AMD32"'],
'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'],
'html': ['beautifulsoup4>=4.7.1'],
'http': [
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/936068
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Id3705f69db209c5750beb23b9cc13d8712009fab
Gerrit-Change-Number: 936068
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
