From 1a6c76495bf9a9c4599c8dd4b794df228051c735 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 31 Oct 2023 17:47:52 +1100 Subject: [PATCH 1/3] Mention olefile in installation instructions --- docs/installation.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/installation.rst b/docs/installation.rst index 2ffd9ae5902..00a32a81ea0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -42,6 +42,11 @@ Install Pillow with :command:`pip`:: python3 -m pip install --upgrade pip python3 -m pip install --upgrade Pillow +:pypi:`olefile` can additionally be installed to allow Pillow to read FPX and +MIC images:: + + python3 -m pip install --upgrade olefile + .. tab:: Linux From b92c09a391d83d8a81e17078f0645e1529255bc5 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Tue, 31 Oct 2023 18:39:38 +1100 Subject: [PATCH 2/3] Updated wording Co-authored-by: Hugo van Kemenade --- docs/installation.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 00a32a81ea0..252ad6e6c38 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -42,8 +42,7 @@ Install Pillow with :command:`pip`:: python3 -m pip install --upgrade pip python3 -m pip install --upgrade Pillow -:pypi:`olefile` can additionally be installed to allow Pillow to read FPX and -MIC images:: +Optionally, install :pypi:`olefile` for Pillow to read FPX and MIC images:: python3 -m pip install --upgrade olefile From d499f0016f1d1a9bbe9711e49623871aa5adb84c Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Thu, 2 Nov 2023 08:21:35 +1100 Subject: [PATCH 3/3] Mention defusedxml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ondrej Baranovič --- docs/installation.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 252ad6e6c38..7afccc5b0c2 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -42,9 +42,10 @@ Install Pillow with :command:`pip`:: python3 -m pip install --upgrade pip python3 -m pip install --upgrade Pillow -Optionally, install :pypi:`olefile` for Pillow to read FPX and MIC images:: +Optionally, install :pypi:`defusedxml` for Pillow to read XMP data, +and :pypi:`olefile` for Pillow to read FPX and MIC images:: - python3 -m pip install --upgrade olefile + python3 -m pip install --upgrade defusedxml olefile .. tab:: Linux