From 128d0edbd6101ce7b8a38755624186d59a9c0fc3 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:22:39 +0200 Subject: [PATCH 1/6] Move anchors back into place --- docs/installation/basic-installation.rst | 8 -------- docs/installation/building-from-source.rst | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/installation/basic-installation.rst b/docs/installation/basic-installation.rst index 486e6863b7b..01aae0406bb 100644 --- a/docs/installation/basic-installation.rst +++ b/docs/installation/basic-installation.rst @@ -87,11 +87,3 @@ and :pypi:`olefile` for Pillow to read FPX and MIC images:: The `Pillow FreeBSD port `_ and packages are tested by the ports team with all supported FreeBSD versions. - - -.. _Building on Linux: -.. _Building on macOS: -.. _Building on Windows: -.. _Building on Windows using MSYS2/MinGW: -.. _Building on FreeBSD: -.. _Building on Android: diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 8f4ef9e3e4a..4cb116a6a91 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -1,3 +1,9 @@ +.. _Building on Linux: +.. _Building on macOS: +.. _Building on Windows: +.. _Building on Windows using MSYS2/MinGW: +.. _Building on FreeBSD: +.. _Building on Android: .. _building-from-source: Building From Source From a027f698d2dead6dff22686ad8c78072d4768611 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:28:06 +0200 Subject: [PATCH 2/6] Fix ref link --- docs/installation/basic-installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/basic-installation.rst b/docs/installation/basic-installation.rst index 01aae0406bb..44e0f305242 100644 --- a/docs/installation/basic-installation.rst +++ b/docs/installation/basic-installation.rst @@ -68,7 +68,7 @@ and :pypi:`olefile` for Pillow to read FPX and MIC images:: python3 -m pip install --upgrade pip python3 -m pip install --upgrade Pillow - To install Pillow in MSYS2, see `Building on Windows using MSYS2/MinGW`_. + To install Pillow in MSYS2, see :ref:`Building on Windows using MSYS2/MinGW`. .. tab:: FreeBSD From 3106446dade24fd6ded018ac6492057589747bf5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:29:16 +0200 Subject: [PATCH 3/6] Move short 'Old Versions' section to 'Building From Source' page --- docs/installation/building-from-source.rst | 9 +++++++++ docs/installation/index.rst | 1 - docs/installation/old-versions.rst | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 docs/installation/old-versions.rst diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 4cb116a6a91..628acfc38a8 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -304,3 +304,12 @@ Build Options Sample usage:: python3 -m pip install --upgrade Pillow -C [feature]=enable + +.. _old-versions: + +Old Versions +============ + +You can download old distributions from the `release history at PyPI +`_ and by direct URL access +eg. https://pypi.org/project/pillow/1.0/. diff --git a/docs/installation/index.rst b/docs/installation/index.rst index 9e6e5eeecdf..a94204b6bbe 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -8,4 +8,3 @@ Installation python-support platform-support building-from-source - old-versions diff --git a/docs/installation/old-versions.rst b/docs/installation/old-versions.rst deleted file mode 100644 index 445a70d4ebf..00000000000 --- a/docs/installation/old-versions.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. _old-versions: - -Old Versions ------------- - -You can download old distributions from the `release history at PyPI -`_ and by direct URL access -eg. https://pypi.org/project/pillow/1.0/. From e9f82959509192a96b933ee344baa580f4bc7a49 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:34:47 +0200 Subject: [PATCH 4/6] Consistent header underlines --- docs/installation/basic-installation.rst | 2 +- docs/installation/building-from-source.rst | 8 ++++---- docs/installation/platform-support.rst | 6 +++--- docs/installation/python-support.rst | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/installation/basic-installation.rst b/docs/installation/basic-installation.rst index 44e0f305242..04d9aca0223 100644 --- a/docs/installation/basic-installation.rst +++ b/docs/installation/basic-installation.rst @@ -1,7 +1,7 @@ .. _basic-installation: Basic Installation ------------------- +================== .. note:: diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 628acfc38a8..6b24eeffa13 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -7,12 +7,12 @@ .. _building-from-source: Building From Source --------------------- +==================== .. _external-libraries: External Libraries -^^^^^^^^^^^^^^^^^^ +------------------ .. note:: @@ -227,7 +227,7 @@ Many of Pillow's features require external libraries: This has been tested within the Termux app on ChromeOS, on x86. Installing -^^^^^^^^^^ +---------- Once you have installed the prerequisites, to install Pillow from the source code on PyPI, run:: @@ -262,7 +262,7 @@ After navigating to the Pillow directory, run:: .. _compressed archive from PyPI: https://pypi.org/project/pillow/#files Build Options -""""""""""""" +^^^^^^^^^^^^^ * Environment variable: ``MAX_CONCURRENCY=n``. Pillow can use multiprocessing to build the extension. Setting ``MAX_CONCURRENCY`` diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 602941c3c5a..9ae97d70ad2 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -1,7 +1,7 @@ .. _platform-support: Platform Support ----------------- +================ Current platform support for Pillow. Binary distributions are contributed for each release on a volunteer basis, but the source @@ -10,7 +10,7 @@ general, we aim to support all current versions of Linux, macOS, and Windows. Continuous Integration Targets -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +------------------------------ These platforms are built and tested for every change. @@ -66,7 +66,7 @@ These platforms are built and tested for every change. Other Platforms -^^^^^^^^^^^^^^^ +--------------- These platforms have been reported to work at the versions mentioned. diff --git a/docs/installation/python-support.rst b/docs/installation/python-support.rst index 8d7db8d3a48..0b366a8cd5e 100644 --- a/docs/installation/python-support.rst +++ b/docs/installation/python-support.rst @@ -1,7 +1,7 @@ .. _python-support: Python Support --------------- +============== Pillow supports these Python versions. From 6eb6b52a68992720db3c605f33fa27ac9fce19fd Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:42:01 +0200 Subject: [PATCH 5/6] Fix tab activation per OS --- docs/installation/basic-installation.rst | 8 ++++++++ docs/installation/building-from-source.rst | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/docs/installation/basic-installation.rst b/docs/installation/basic-installation.rst index 04d9aca0223..c2f889f0ef3 100644 --- a/docs/installation/basic-installation.rst +++ b/docs/installation/basic-installation.rst @@ -1,3 +1,11 @@ +.. raw:: html + + + .. _basic-installation: Basic Installation diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 6b24eeffa13..05e6572724a 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -1,3 +1,11 @@ +.. raw:: html + + + .. _Building on Linux: .. _Building on macOS: .. _Building on Windows: From d2d6beaf34b1775e5634bc1406e264b3b0c88b23 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 7 Mar 2024 19:24:37 +1100 Subject: [PATCH 6/6] Simplified anchors --- docs/installation/basic-installation.rst | 2 +- docs/installation/building-from-source.rst | 6 ------ docs/installation/python-support.rst | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/docs/installation/basic-installation.rst b/docs/installation/basic-installation.rst index c2f889f0ef3..01981aa4fbe 100644 --- a/docs/installation/basic-installation.rst +++ b/docs/installation/basic-installation.rst @@ -76,7 +76,7 @@ and :pypi:`olefile` for Pillow to read FPX and MIC images:: python3 -m pip install --upgrade pip python3 -m pip install --upgrade Pillow - To install Pillow in MSYS2, see :ref:`Building on Windows using MSYS2/MinGW`. + To install Pillow in MSYS2, see :ref:`building-from-source`. .. tab:: FreeBSD diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 05e6572724a..349d191a68a 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -6,12 +6,6 @@ }); -.. _Building on Linux: -.. _Building on macOS: -.. _Building on Windows: -.. _Building on Windows using MSYS2/MinGW: -.. _Building on FreeBSD: -.. _Building on Android: .. _building-from-source: Building From Source diff --git a/docs/installation/python-support.rst b/docs/installation/python-support.rst index 0b366a8cd5e..dd5765b6b70 100644 --- a/docs/installation/python-support.rst +++ b/docs/installation/python-support.rst @@ -12,8 +12,3 @@ Pillow supports these Python versions. .. csv-table:: Older versions :file: older-versions.csv :header-rows: 1 - -.. _Linux Installation: -.. _macOS Installation: -.. _Windows Installation: -.. _FreeBSD Installation: