jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1197671?usp=email )
Change subject: Tests: Update Pillow requirements
......................................................................
Tests: Update Pillow requirements
Bug: T407691
Change-Id: Iaf9fdc3112cc2cb90ef669e89cd6348777f763f1
---
M requirements.txt
M setup.py
2 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index 8b2ec76..ef34875 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,11 +42,12 @@
python-stdnum >= 1.20
# GUI
-Pillow==10.4.0; python_version < "3.9"
-Pillow>=11.1.0,<11.3.0; python_version == "3.9"
-Pillow>=11.1.0,<11.3.0; platform_python_implementation == "PyPy" and
python_version < "3.11"
+Pillow==10.4.0; platform_python_implementation == "PyPy" and python_version <
"3.9"
+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; python_version >= "3.10"
+Pillow==10.4.0; platform_python_implementation != "PyPy" and python_version <
"3.9"
+Pillow>=11.1.0,<11.3.0; platform_python_implementation != "PyPy" and
python_version == "3.9"
+Pillow>=11.1.0; platform_python_implementation != "PyPy" and python_version >=
"3.10"
# core pagegenerators
googlesearch-python >= 1.3.0
diff --git a/setup.py b/setup.py
index 1d199af..28821be 100755
--- a/setup.py
+++ b/setup.py
@@ -46,13 +46,18 @@
'mysql': ['PyMySQL >= 1.1.1'],
# vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1
'Tkinter': [
- 'Pillow==10.4.0; python_version < "3.9"',
- 'Pillow>=11.1.0,<11.3.0; python_version == "3.9"',
+ 'Pillow==10.4.0; platform_python_implementation == "PyPy" '
+ 'and python_version < "3.9"',
'Pillow>=11.1.0,<11.3.0; platform_python_implementation == "PyPy" '
- 'and python_version < "3.11"',
+ '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; python_version >= "3.10"',
+ 'Pillow==10.4.0; platform_python_implementation != "PyPy" '
+ 'and python_version < "3.9"',
+ 'Pillow>=11.1.0,<11.3.0; platform_python_implementation != "PyPy" '
+ 'and python_version == "3.9"',
+ 'Pillow>=11.1.0; platform_python_implementation != "PyPy" '
+ 'and python_version >= "3.10"',
],
'mwoauth': [
'PyJWT != 2.10.0, != 2.10.1; python_version > "3.8"', # T380270
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1197671?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: Iaf9fdc3112cc2cb90ef669e89cd6348777f763f1
Gerrit-Change-Number: 1197671
Gerrit-PatchSet: 1
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]
