From d321674b71683b19e65a5ad7fbe4e0c9df074cd5 Mon Sep 17 00:00:00 2001
From: Ken Rimey <rimey@google.com>
Date: Sun, 17 Apr 2016 14:11:02 -0400
Subject: [PATCH] Stop requiring pyOpenSSL.

This is no longer needed.
---
 CONTRIBUTING.rst | 15 ++++-----------
 docs/index.rst   | 16 ----------------
 setup.py         |  1 -
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index c2b509bfc2ff..13c46141b4fb 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -67,18 +67,11 @@ repo, from which you can submit a pull request.
 I'm getting weird errors... Can you help?
 -----------------------------------------
 
-Chances are you have some dependency problems...
-If you're on Ubuntu,
-try installing the pre-compiled packages::
+If the error mentions ``Python.h`` not being found,
+install ``python-dev`` and try again.
+On Debian/Ubuntu::
 
-  $ sudo apt-get install python-crypto python-openssl libffi-dev
-
-or try installing the development packages
-(that have the header files included)
-and then ``pip install`` the dependencies again::
-
-  $ sudo apt-get install python-dev libssl-dev libffi-dev
-  $ pip install gcloud
+  $ sudo apt-get install python-dev
 
 Adding Features
 ---------------
diff --git a/docs/index.rst b/docs/index.rst
index a9c1094a6789..a197cdd2faf5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -138,22 +138,6 @@ The ``gcloud`` library is ``pip`` install-able:
 
     $ pip install gcloud
 
-If you have trouble installing
-``pycrypto`` or ``pyopenssl``
-(and you're on Ubuntu),
-you can try install the precompiled packages:
-
-.. code-block:: console
-
-    $ sudo apt-get install python-crypto python-openssl
-
-If you want to install everything with ``pip``,
-try installing the ``dev`` packages beforehand:
-
-.. code-block:: console
-
-    $ sudo apt-get install python-dev libssl-dev
-
 If you want to install ``gcloud-python`` from source,
 you can clone the repository from GitHub:
 
diff --git a/setup.py b/setup.py
index 3c7022aebbb5..5363d4f07d8e 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,6 @@
     'googleapis-common-protos',
     'oauth2client >= 2.0.1',
     'protobuf >= 3.0.0b2, != 3.0.0.b2.post1',
-    'pyOpenSSL',
     'six',
 ]
 GRPC_EXTRAS = ['grpcio >= 0.13.1']