jenkins-bot merged this change.

View Change

[bugfix] Update Pillow dependency

- use Pillow < 7.0.0 for Python 2.7
- use Pillow < 6.0.0 for 2.7 < Python < 3.5

Bug: T220105
Change-Id: I1a88050acf89a506076317eb18691467b538570c
---
M requirements.txt
M setup.py
2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1bf8fd8..51b74fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -41,7 +41,9 @@
 python-stdnum
 
 # GUI
-Pillow
+Pillow < 7.0.0 ; python_version < '3'
+Pillow < 6.0.0 ; python_version > '2' and python_full_version < '3.5'
+Pillow ; python_full_version >= '3.5'
 
 # core pagegenerators
 google >= 1.7
diff --git a/setup.py b/setup.py
index 870a872..ce8ddbd 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,13 @@
 dependencies = ['requests>=2.20.0']
 
 pydocstyle = 'pydocstyle<=3.0.0' if PY2 else 'pydocstyle>=2.5.0'
+if PY2:
+    pillow = 'Pillow<7.0.0'
+elif PYTHON_VERSION < (3, 5):
+    pillow = 'Pillow<6.0.0'
+else:
+    pillow = 'Pillow'
+
 extra_deps = {
     # Core library dependencies
     'eventstreams': ['sseclient>=0.0.18,!=0.0.23'],
@@ -46,7 +53,7 @@
     'Google': ['google>=1.7'],
     'IRC': ['irc'],
     'mwparserfromhell': ['mwparserfromhell>=0.3.3'],
-    'Tkinter': ['Pillow'],
+    'Tkinter': [pillow],
     'security': ['requests[security]', 'pycparser!=2.14'],
     'mwoauth': ['mwoauth>=0.2.4,!=0.3.1'],
     'html': ['BeautifulSoup4'],
@@ -76,7 +83,7 @@
     })
 
 script_deps = {
-    'flickrripper.py': ['flickrapi', 'Pillow'],
+    'flickrripper.py': ['flickrapi', pillow],
     'states_redirect.py': ['pycountry'],
     'weblinkchecker.py': ['memento_client>=0.5.1,!=0.6.0'],
     'patrol.py': ['mwparserfromhell>=0.3.3'],

To view, visit change 501316. To unsubscribe, or for help writing mail filters, visit settings.