From f4b1c772dc8a13a59830b1f7e2f7662a234648e7 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 18 Feb 2020 21:48:52 +0200 Subject: [PATCH 1/2] Recommend upgrading pip and Pillow --- docs/installation.rst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 48a1283ec..81571bfef 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -47,8 +47,8 @@ Basic Installation Install Pillow with :command:`pip`:: - python -m pip install pip - python -m pip install Pillow + python -m pip install --upgrade pip + python -m pip install --upgrade Pillow Windows Installation @@ -59,8 +59,8 @@ supported Pythons in both 32 and 64-bit versions in wheel, egg, and executable installers. These binaries have all of the optional libraries included except for raqm and libimagequant:: - python -m pip install pip - python -m pip install Pillow + python -m pip install --upgrade pip + python -m pip install --upgrade Pillow macOS Installation @@ -71,8 +71,8 @@ versions in the wheel format. These include support for all optional libraries except libimagequant. Raqm support requires libraqm, fribidi, and harfbuzz to be installed separately:: - python -m pip install pip - python -m pip install Pillow + python -m pip install --upgrade pip + python -m pip install --upgrade Pillow Linux Installation ^^^^^^^^^^^^^^^^^^ @@ -82,8 +82,8 @@ versions in the manylinux wheel format. These include support for all optional libraries except libimagequant. Raqm support requires libraqm, fribidi, and harfbuzz to be installed separately:: - python -m pip install pip - python -m pip install Pillow + python -m pip install --upgrade pip + python -m pip install --upgrade Pillow Most major Linux distributions, including Fedora, Debian/Ubuntu and ArchLinux also include Pillow in packages that previously contained @@ -195,8 +195,8 @@ Many of Pillow's features require external libraries: Once you have installed the prerequisites, run:: - python -m pip install pip - python -m pip install Pillow + python -m pip install --upgrade pip + python -m pip install --upgrade Pillow If the prerequisites are installed in the standard library locations for your machine (e.g. :file:`/usr` or :file:`/usr/local`), no @@ -280,8 +280,8 @@ Then see ``depends/install_raqm_cmake.sh`` to install libraqm. Now install Pillow with:: - python -m pip install pip - python -m pip install Pillow + python -m pip install --upgrade pip + python -m pip install --upgrade Pillow or from within the uncompressed source directory:: From 5bb18c08ff9d2aacc4b24736e7d32ab8da435806 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 19 Feb 2020 18:59:28 +1100 Subject: [PATCH 2/2] Recommend upgrading Pillow [ci skip] --- docs/installation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 81571bfef..062881411 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -206,7 +206,7 @@ those locations by editing :file:`setup.py` or :file:`setup.cfg`, or by adding environment variables on the command line:: - CFLAGS="-I/usr/pkg/include" python -m pip install pillow + CFLAGS="-I/usr/pkg/include" python -m pip install --upgrade Pillow If Pillow has been previously built without the required prerequisites, it may be necessary to manually clear the pip cache or @@ -254,7 +254,7 @@ Sample usage:: or using pip:: - python -m pip install pillow --global-option="build_ext" --global-option="--enable-[feature]" + python -m pip install --upgrade Pillow --global-option="build_ext" --global-option="--enable-[feature]" Building on macOS