Merge pull request #2336 from python-pillow/3.5.0-to-4.0.0

Pillow 3.5.0 became 4.0.0
This commit is contained in:
Hugo 2017-01-03 14:19:32 +01:00 committed by GitHub
commit 9dddca0be2

View File

@ -15,9 +15,9 @@ Notes
.. note:: Pillow < 2.0.0 supports Python versions 2.4, 2.5, 2.6, 2.7. .. note:: Pillow < 2.0.0 supports Python versions 2.4, 2.5, 2.6, 2.7.
.. note:: Pillow >= 2.0.0 < 3.5.0 supports Python versions 2.6, 2.7, 3.2, 3.3, 3.4, 3.5 .. note:: Pillow >= 2.0.0 < 4.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3, 3.4, 3.5
.. note:: Pillow >= 3.5.0 supports Python versions 2.7, 3.3, 3.4, 3.5, 3.6 .. note:: Pillow >= 4.0.0 supports Python versions 2.7, 3.3, 3.4, 3.5, 3.6
Basic Installation Basic Installation
------------------ ------------------
@ -193,7 +193,7 @@ build with newly installed external libraries.
Build Options Build Options
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
* Environment Variable: ``MAX_CONCURRENCY=n``. By default, Pillow will * Environment variable: ``MAX_CONCURRENCY=n``. By default, Pillow will
use multiprocessing to build the extension on all available CPUs, use multiprocessing to build the extension on all available CPUs,
but not more than 4. Setting ``MAX_CONCURRENCY`` to 1 will disable but not more than 4. Setting ``MAX_CONCURRENCY`` to 1 will disable
parallel building. parallel building.
@ -223,7 +223,7 @@ Build Options
stdout. stdout.
Sample Usage:: Sample usage::
$ MAX_CONCURRENCY=1 python setup.py build_ext --enable-[feature] install $ MAX_CONCURRENCY=1 python setup.py build_ext --enable-[feature] install