aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2019-06-02 20:42:20 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2019-06-02 19:42:20 -0500
commit75b4eaac47bc13f68a4838219f095ebf6d416eaf (patch)
treeb2ebdb0e0ffb32e99325091533a73c0de6bf7679 /docs
parent5af23ed2798448f9c0975ceaeff65a73dfb59ffb (diff)
downloadcryptography-75b4eaac47bc13f68a4838219f095ebf6d416eaf.tar.gz
cryptography-75b4eaac47bc13f68a4838219f095ebf6d416eaf.tar.bz2
cryptography-75b4eaac47bc13f68a4838219f095ebf6d416eaf.zip
Manylinux2010 wheel (#4910)
* add manylinux2010 wheel builder * various updates * empty commit * need to pass a plat tag * hacks need hacks
Diffstat (limited to 'docs')
-rw-r--r--docs/doing-a-release.rst3
-rw-r--r--docs/installation.rst16
2 files changed, 10 insertions, 9 deletions
diff --git a/docs/doing-a-release.rst b/docs/doing-a-release.rst
index 6c309d35..733d67f4 100644
--- a/docs/doing-a-release.rst
+++ b/docs/doing-a-release.rst
@@ -23,7 +23,8 @@ Verifying OpenSSL version
The release process creates wheels bundling OpenSSL for Windows, macOS, and
Linux. Check that the Windows and macOS Azure Pipelines builders have the latest
version of OpenSSL installed and verify that the latest version is present in
-the ``pyca/cryptography-manylinux1`` docker containers. If anything is out
+both the ``pyca/cryptography-manylinux1`` and
+``pyca/cryptography-manylinux2010`` docker containers. If anything is out
of date follow the instructions for upgrading OpenSSL.
Upgrading OpenSSL
diff --git a/docs/installation.rst b/docs/installation.rst
index e006fc25..7118cb1e 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -75,10 +75,10 @@ local `wheel cache`_.
Building cryptography on Linux
------------------------------
-``cryptography`` ships a ``manylinux1`` wheel (as of 2.0) so all dependencies
-are included. For users on pip 8.1 or above running on a ``manylinux1``
-compatible distribution (almost everything except Alpine) all you should
-need to do is:
+``cryptography`` ships ``manylinux`` wheels (as of 2.0) so all dependencies
+are included. For users on pip 8.1 or above running on a ``manylinux1`` or
+``manylinux2010`` compatible distribution (almost everything except Alpine)
+all you should need to do is:
.. code-block:: console
@@ -122,8 +122,8 @@ Building
~~~~~~~~
You should now be able to build and install cryptography. To avoid getting
-the pre-built wheel on ``manylinux1`` distributions you'll need to use
-``--no-binary``.
+the pre-built wheel on ``manylinux`` compatible distributions you'll need to
+use ``--no-binary``.
.. code-block:: console
@@ -163,9 +163,9 @@ Static Wheels
~~~~~~~~~~~~~
Cryptography ships statically-linked wheels for macOS, Windows, and Linux (via
-``manylinux1``). This allows compatible environments to use the most recent
+``manylinux``). This allows compatible environments to use the most recent
OpenSSL, regardless of what is shipped by default on those platforms. Some
-Linux distributions (most notably Alpine) are not ``manylinux1`` compatible so
+Linux distributions (most notably Alpine) are not ``manylinux`` compatible so
we cannot distribute wheels for them.
However, you can build your own statically-linked wheels that will work on your