Merge remote-tracking branch 'pyca/master' into release-0.14

1 files changed, 4 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 95d8635..5ae8038 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 Installation script for the OpenSSL module
 """
 
-from distutils.core import setup
+from setuptools import setup
 
 # XXX Deduplicate this
 __version__ = '0.14a1'
@@ -34,6 +34,7 @@ setup(name='pyOpenSSL', version=__version__,
       maintainer_email = 'exarkun@twistedmatrix.com',
       url = 'https://github.com/pyca/pyopenssl',
       license = 'APL2',
+      install_requires=["cryptography>=0.1", "six>=1.5.2"],
       long_description = """\
 High-level wrapper around a subset of the OpenSSL library, includes
  * SSL.Connection objects, wrapping the methods of Python's portable
@@ -57,4 +58,5 @@ High-level wrapper around a subset of the OpenSSL library, includes
         'Topic :: Security :: Cryptography',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: System :: Networking',
-        ])
+        ],
+      test_suite="OpenSSL")