jenkins-bot has submitted this change and it was merged.

Change subject: Use Pillow instead of PIL in setup.py ......................................................................

Use Pillow instead of PIL in setup.py

PIL stopped working in travis builds. It works correctly under setuptools 5.7, but fails under setuptools 3.3 Rather than force a setuptools upgrade on everyone, use Pillow.

'PIL is not setuptools compatible.' http://pillow.readthedocs.org/en/latest/about.html#why-a-fork

Remove the apt-get of python-imaging-tk, which previously installed PIL. 'System Python is not used and should not be relied on.' http://docs.travis-ci.com/user/languages/python/

Change-Id: Ic437462da8b637ce17a333c19a62b02a63474a07 --- M .travis.yml M setup.py 2 files changed, 2 insertions(+), 2 deletions(-)

Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified

diff --git a/.travis.yml b/.travis.yml index 96983cf..32df44d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@

before_install: - sudo apt-get update -qq - - sudo apt-get install -y python-imaging-tk liblua5.1-dev + - sudo apt-get install -y liblua5.1-dev

install: - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install ordereddict unittest2; fi diff --git a/setup.py b/setup.py index 422561e..86102fb 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ script_deps = { 'script_wui.py': ['irc', 'lunatic-python', 'crontab'], # Note: None of the 'lunatic-python' repos on github support MS Windows. - 'flickrripper.py': ['PIL', 'flickrapi'], + 'flickrripper.py': ['Pillow', 'flickrapi'], # Note: 'PIL' is not available via pip2.7 on MS Windows, # however it is available with setuptools. }