aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2019-05-26 10:35:00 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2019-05-26 10:35:00 -0400
commit463348bc71b8737b6c620e97286468f3a5c1322f (patch)
tree35092bb6dff5ccd3e684f864a21669488e9257c8 /docs
parent4f7715b6e6e6d9ee8a41e2e3615d5187d64ae013 (diff)
downloadcryptography-463348bc71b8737b6c620e97286468f3a5c1322f.tar.gz
cryptography-463348bc71b8737b6c620e97286468f3a5c1322f.tar.bz2
cryptography-463348bc71b8737b6c620e97286468f3a5c1322f.zip
update docs with latest info & remove the last ci.cryptography.io stuff (#4898)
Diffstat (limited to 'docs')
-rw-r--r--docs/installation.rst9
-rw-r--r--docs/security.rst6
2 files changed, 8 insertions, 7 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index 65d24da5..e006fc25 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -14,11 +14,12 @@ Currently we test ``cryptography`` on Python 2.7, 3.4+, and
PyPy 5.4+ on these operating systems.
* x86-64 CentOS 7.x
-* macOS 10.12 Sierra, 10.10 Yosemite
+* x86-64 Fedora (latest)
+* macOS 10.13 High Sierra, 10.14 Mojave
* x86-64 Ubuntu 14.04, 16.04, and rolling
* x86-64 Debian Jessie (8.x), Stretch (9.x), Buster (10.x), and Sid (unstable)
* x86-64 Alpine (latest)
-* 32-bit and 64-bit Python on 64-bit Windows Server 2012
+* 32-bit and 64-bit Python on 64-bit Windows Server 2019
We test compiling with ``clang`` as well as ``gcc`` and use the following
OpenSSL releases:
@@ -47,7 +48,7 @@ just run
If you prefer to compile it yourself you'll need to have OpenSSL installed.
You can compile OpenSSL yourself as well or use the binaries we build for our
-release infrastructure (`openssl-release`_). Be sure to download the proper
+own `infrastructure`_. Be sure to download the proper
version for your architecture and Python (2010 works for Python 2.7, 3.3,
and 3.4 while 2015 is required for 3.5 and above). Wherever you place your copy
of OpenSSL you'll need to set the ``LIB`` and ``INCLUDE`` environment variables
@@ -279,7 +280,7 @@ local `wheel cache`_.
.. _`Homebrew`: https://brew.sh
.. _`MacPorts`: https://www.macports.org
-.. _`openssl-release`: https://ci.cryptography.io/job/cryptography-support-jobs/job/openssl-release-1.1/
+.. _`infrastructure`: https://github.com/pyca/infra/tree/master/windows/openssl
.. _virtualenv: https://virtualenv.pypa.io/en/latest/
.. _openssl.org: https://www.openssl.org/source/
.. _`wheel cache`: https://pip.pypa.io/en/stable/reference/pip_install/#caching
diff --git a/docs/security.rst b/docs/security.rst
index 01845a48..affe4348 100644
--- a/docs/security.rst
+++ b/docs/security.rst
@@ -9,9 +9,9 @@ Infrastructure
--------------
In addition to ``cryptography``'s code, we're also concerned with the security
-of the infrastructure we run (primarily ``cryptography.io`` and
-``ci.cryptography.io``). If you discover a security vulnerability in our
-infrastructure, we ask you to report it using the same procedure.
+of the infrastructure we run (primarily ``cryptography.io``). If you discover
+a security vulnerability in our infrastructure, we ask you to report it using
+the same procedure.
What is a security issue?
-------------------------