Skip to content

Commit ceb0c57

Browse files
authored
Merge pull request #7858 from hugovk/docs-installation
Update installation docs
2 parents ea78028 + baa10a8 commit ceb0c57

6 files changed

Lines changed: 35 additions & 32 deletions

File tree

docs/installation/basic-installation.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1+
.. raw:: html
2+
3+
<script>
4+
document.addEventListener('DOMContentLoaded', function() {
5+
activateTab(getOS());
6+
});
7+
</script>
8+
19
.. _basic-installation:
210

311
Basic Installation
4-
------------------
12+
==================
513

614
.. note::
715

@@ -68,7 +76,7 @@ and :pypi:`olefile` for Pillow to read FPX and MIC images::
6876
python3 -m pip install --upgrade pip
6977
python3 -m pip install --upgrade Pillow
7078

71-
To install Pillow in MSYS2, see `Building on Windows using MSYS2/MinGW`_.
79+
To install Pillow in MSYS2, see :ref:`building-from-source`.
7280

7381
.. tab:: FreeBSD
7482

@@ -87,11 +95,3 @@ and :pypi:`olefile` for Pillow to read FPX and MIC images::
8795
The `Pillow FreeBSD port
8896
<https://www.freshports.org/graphics/py-pillow/>`_ and packages
8997
are tested by the ports team with all supported FreeBSD versions.
90-
91-
92-
.. _Building on Linux:
93-
.. _Building on macOS:
94-
.. _Building on Windows:
95-
.. _Building on Windows using MSYS2/MinGW:
96-
.. _Building on FreeBSD:
97-
.. _Building on Android:

docs/installation/building-from-source.rst

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1+
.. raw:: html
2+
3+
<script>
4+
document.addEventListener('DOMContentLoaded', function() {
5+
activateTab(getOS());
6+
});
7+
</script>
8+
19
.. _building-from-source:
210

311
Building From Source
4-
--------------------
12+
====================
513

614
.. _external-libraries:
715

816
External Libraries
9-
^^^^^^^^^^^^^^^^^^
17+
------------------
1018

1119
.. note::
1220

@@ -221,7 +229,7 @@ Many of Pillow's features require external libraries:
221229
This has been tested within the Termux app on ChromeOS, on x86.
222230

223231
Installing
224-
^^^^^^^^^^
232+
----------
225233

226234
Once you have installed the prerequisites, to install Pillow from the source
227235
code on PyPI, run::
@@ -256,7 +264,7 @@ After navigating to the Pillow directory, run::
256264
.. _compressed archive from PyPI: https://pypi.org/project/pillow/#files
257265

258266
Build Options
259-
"""""""""""""
267+
^^^^^^^^^^^^^
260268

261269
* Environment variable: ``MAX_CONCURRENCY=n``. Pillow can use
262270
multiprocessing to build the extension. Setting ``MAX_CONCURRENCY``
@@ -298,3 +306,12 @@ Build Options
298306
Sample usage::
299307

300308
python3 -m pip install --upgrade Pillow -C [feature]=enable
309+
310+
.. _old-versions:
311+
312+
Old Versions
313+
============
314+
315+
You can download old distributions from the `release history at PyPI
316+
<https://pypi.org/project/pillow/#history>`_ and by direct URL access
317+
eg. https://pypi.org/project/pillow/1.0/.

docs/installation/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ Installation
88
python-support
99
platform-support
1010
building-from-source
11-
old-versions

docs/installation/old-versions.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

docs/installation/platform-support.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _platform-support:
22

33
Platform Support
4-
----------------
4+
================
55

66
Current platform support for Pillow. Binary distributions are
77
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
1010
Windows.
1111

1212
Continuous Integration Targets
13-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
13+
------------------------------
1414

1515
These platforms are built and tested for every change.
1616

@@ -66,7 +66,7 @@ These platforms are built and tested for every change.
6666

6767

6868
Other Platforms
69-
^^^^^^^^^^^^^^^
69+
---------------
7070

7171
These platforms have been reported to work at the versions mentioned.
7272

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _python-support:
22

33
Python Support
4-
--------------
4+
==============
55

66
Pillow supports these Python versions.
77

@@ -12,8 +12,3 @@ Pillow supports these Python versions.
1212
.. csv-table:: Older versions
1313
:file: older-versions.csv
1414
:header-rows: 1
15-
16-
.. _Linux Installation:
17-
.. _macOS Installation:
18-
.. _Windows Installation:
19-
.. _FreeBSD Installation:

0 commit comments

Comments
 (0)