Mercurial > moin-2.0

changeset 2061:02c56ec7c09f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs / setup.py: mention pillow as an alternative to PIL
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 31 Mar 2013 17:29:18 +0200
parents f0ebab8bea8b
children 5006c97ab86d
files docs/admin/install.rst setup.py
diffstat 2 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/docs/admin/install.rst	Sun Mar 31 00:09:26 2013 +0100
+++ b/docs/admin/install.rst	Sun Mar 31 17:29:18 2013 +0200
@@ -133,10 +133,12 @@
  moin index-build
 
 
-Installing PIL
-~~~~~~~~~~~~~~
+Installing PIL / pillow
+~~~~~~~~~~~~~~~~~~~~~~~
 For some image processing functions that MoinMoin uses like resizing and rotating,
-you need PIL, which is the Python Imaging Library.
+you need PIL, which is the Python Imaging Library (sometimes also referred to as
+python-imaging). Instead of PIL, you can also use pillow, which is a compatible
+fork of PIL (with more active maintenance and it also has been ported to Python 3).
 
 Windows users who want to install PIL should skip the remainder of this section and read
 Troubleshooting -- PIL Installation Under Windows below.
@@ -151,7 +153,12 @@
 
 Now activate your virtual environment and install PIL into it::
 
- pip install pil # for Linux or other POSIX OSes
+ pip install pil  # for Linux (or other POSIX OSes)
+
+Alternatively, if you prefer to use pillow::
+
+ pip install pillow  # for Linux (or other POSIX OSes)
+
 
 Troubleshooting
 ---------------
@@ -202,8 +209,8 @@
 
 Repeat these steps until you don't see fatal errors.
 
-PIL Installation Under Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+PIL/pillow Installation Under Windows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 PIL version 1.1.7 does not install correctly via "pip install pil" on Windows.
 Some users have had success using "pip install pillow", a fork of PIL fixing
 a packaging issue. Other users have resorted to installing PIL 1.1.6 in the
--- a/setup.py	Sun Mar 31 00:09:26 2013 +0100
+++ b/setup.py	Sun Mar 31 17:29:18 2013 +0200
@@ -123,6 +123,7 @@
                          # PIL is a binary dependency and some features of it
                          # require special libs/header to be installed before
                          # it can be compiled successfully
+        'pillow': ["pillow"],  # alternative to PIL
         'ldap': ["python-ldap>=2.0.0"],  # used by ldap auth
         'openid': ["python-openid>=2.2.4"],  # used by openid rp auth
         'sqla': ["sqlalchemy>=0.7.1"],  # used by sqla store