From 75b4eaac47bc13f68a4838219f095ebf6d416eaf Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 2 Jun 2019 20:42:20 -0400 Subject: Manylinux2010 wheel (#4910) * add manylinux2010 wheel builder * various updates * empty commit * need to pass a plat tag * hacks need hacks --- docs/doing-a-release.rst | 3 ++- docs/installation.rst | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'docs') 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 -- cgit v1.2.3