jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1203207?usp=email )
Change subject: Update Pillow requirements
......................................................................
Update Pillow requirements
Bug: T407691
Change-Id: Iacc406a45949f08d06c4644a167ed099edf9fead
---
M requirements.txt
M setup.py
2 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/requirements.txt b/requirements.txt
index bf1fc49..84be879 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,10 +42,9 @@
python-stdnum >= 2.1
# GUI
-Pillow>=11.1.0,<11.3.0; platform_python_implementation == "PyPy" and
python_version >= "3.9" and python_version < "3.11"
-Pillow>=11.1.0; platform_python_implementation == "PyPy" and python_version >=
"3.11"
-Pillow>=11.1.0,<11.3.0; platform_python_implementation != "PyPy" and
python_version == "3.9"
-Pillow>=12.0.0; platform_python_implementation != "PyPy" and python_version >=
"3.10"
+Pillow==10.4.0; platform_python_implementation == "PyPy" and python_version ==
"3.9"
+Pillow==11.3.0; platform_python_implementation == "PyPy" and python_version ==
"3.10"
+Pillow>=10.4.0; platform_python_implementation != "PyPy" or python_version >=
"3.11"
# core pagegenerators
googlesearch-python >= 1.3.0
diff --git a/setup.py b/setup.py
index 97e16ec..c344367 100755
--- a/setup.py
+++ b/setup.py
@@ -45,14 +45,12 @@
'wikitextparser': ['wikitextparser>=0.56.4'],
'mysql': ['PyMySQL >= 1.1.2'],
'Tkinter': [
- 'Pillow>=11.1.0,<11.3.0; platform_python_implementation == "PyPy" '
- 'and python_version >= "3.9" and python_version < "3.11"',
- 'Pillow>=11.1.0; platform_python_implementation == "PyPy" '
- 'and python_version >= "3.11"',
- 'Pillow>=11.1.0,<11.3.0; platform_python_implementation != "PyPy" '
+ 'Pillow==10.4.0; platform_python_implementation == "PyPy" '
'and python_version == "3.9"',
- 'Pillow>=12.0.0; platform_python_implementation != "PyPy" '
- 'and python_version >= "3.10"',
+ 'Pillow==11.3.0; platform_python_implementation == "PyPy" '
+ 'and python_version == "3.10"',
+ 'Pillow>=10.4.0; platform_python_implementation != "PyPy" '
+ 'or python_version >= "3.11"',
],
'mwoauth': [
'PyJWT != 2.10.0, != 2.10.1', # T380270
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1203207?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Iacc406a45949f08d06c4644a167ed099edf9fead
Gerrit-Change-Number: 1203207
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
