jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342779 )
Change subject: Use Pillow<3.5.0 on python2.6
......................................................................
Use Pillow<3.5.0 on python2.6
Bug: T160486
Change-Id: Icf8a1ef4daabea65f331f843808bb5e40bce7c89
---
M requirements.txt
M setup.py
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/requirements.txt b/requirements.txt
index 6b82cb5..b87f833 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -50,7 +50,8 @@
python-stdnum
# GUI
-Pillow
+Pillow<3.5.0 ; python_version < '2.7'
+Pillow ; python_version >= '2.7'
# core pagegenerators
google >= 1.7
diff --git a/setup.py b/setup.py
index 2ba209d..560a408 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@
'Google': ['google>=1.7'],
'IRC': [irc_dep],
'mwparserfromhell': ['mwparserfromhell>=0.3.3'],
- 'Tkinter': ['Pillow'],
+ 'Tkinter': ['Pillow<3.5.0' if PY26 else 'Pillow'],
# 0.6.1 supports socket.io 1.0, but WMF is using 0.9 (T91393 and T85716)
'rcstream': ['socketIO-client<0.6.1'],
'security': ['requests[security]', 'pycparser!=2.14'],
@@ -76,7 +76,7 @@
})
script_deps = {
- 'flickrripper.py': ['Pillow'],
+ 'flickrripper.py': ['Pillow<3.5.0' if PY26 else 'Pillow'],
'states_redirect.py': ['pycountry'],
'weblinkchecker.py': ['memento_client>=0.5.1'],
'patrol.py': ['mwparserfromhell>=0.3.3'],
--
To view, visit https://gerrit.wikimedia.org/r/342779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf8a1ef4daabea65f331f843808bb5e40bce7c89
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Magul <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
