aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-09-22 23:03:53 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-09-22 23:03:53 -0400
commit9bcad79b327b58af8f8ca538184dbeda233b5f6b (patch)
treebd96c461e9ec7b4d7888094fc08e1652e8959cc5
parent6da24565098ae63488bb54ec452b3ecf3f4484ae (diff)
parentb1735244386c74ab6fda25f47207f85bbf6f786b (diff)
downloadcryptography-9bcad79b327b58af8f8ca538184dbeda233b5f6b.tar.gz
cryptography-9bcad79b327b58af8f8ca538184dbeda233b5f6b.tar.bz2
cryptography-9bcad79b327b58af8f8ca538184dbeda233b5f6b.zip
Merge pull request #2361 from reaperhulk/release-docs
add docs on how to upgrade OpenSSL on OS X and windows builders
-rw-r--r--docs/doing-a-release.rst25
1 files changed, 20 insertions, 5 deletions
diff --git a/docs/doing-a-release.rst b/docs/doing-a-release.rst
index 283b98b6..0087ec59 100644
--- a/docs/doing-a-release.rst
+++ b/docs/doing-a-release.rst
@@ -3,12 +3,27 @@ Doing a release
Doing a release of ``cryptography`` requires a few steps.
-Verifying OpenSSL version
--------------------------
+Verifying and upgrading OpenSSL version
+---------------------------------------
-The release process uses a static build for Windows wheels. Check that the
-Windows Jenkins builders have the latest version of OpenSSL installed
-before performing the release.
+The release process uses a static build for Windows and OS X wheels. Check that
+the Windows and OS X Jenkins builders have the latest version of OpenSSL
+installed before performing the release. If they do not:
+
+Upgrading Windows
+~~~~~~~~~~~~~~~~~
+
+Run the ``openssl-release`` Jenkins job, then copy the resulting artifacts to
+the Windows builders and unzip them in the root of the file system.
+
+Upgrading OS X
+~~~~~~~~~~~~~~
+
+``brew update`` and then ``brew upgrade openssl --universal --build-bottle`` to
+build a universal library (32-bit and 64-bit) compatible with all Intel Macs.
+This can be confirmed by using
+``lipo -info /usr/local/opt/openssl/lib/libssl.dylib`` to see the available
+architectures.
Bumping the version number
--------------------------