Merge branch 'master' into idea-bespoke-vectors

* master: (246 commits)
  Fixed python3 incompatibility
  Removed dependency on setuptools for version check
  don't need to move these definitions
  conditional NIDs for 0.9.8e
  x509 changes for 0.9.8e support
  more changes for 0.9.8e support, this time in the ssl.h headers
  macro switches in evp for 0.9.8e
  bind some error constants conditionally for 0.9.8e support
  BIO macro switch for 0.9.8e support
  move some nids
  conditionally bind AES_wrap/unwrap for 0.9.8e support
  Add GPG key fingerprint for lvh
  change comparison to be easier to read
  ridiculous workaround time
  whoops
  Missing imports
  Convert stuff
  Add binding for DSA_new
  Fix drop in coverage levels by removing branches
  Added check to turn of CC backend for OS X version < 10.8
  ...

Conflicts:
	docs/development/test-vectors.rst

1 files changed, 25 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index 81a50f44..238ee9b7 100644
--- a/setup.py
+++ b/setup.py
@@ -11,10 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
+import sys
 from distutils.command.build import build
 
 from setuptools import setup, find_packages
-
+from setuptools.command.test import test
 
 base_dir = os.path.dirname(__file__)
 
@@ -31,8 +32,14 @@ requirements = [
     SIX_DEPENDENCY
 ]
 
+test_requirements = [
+    "pytest",
+    "pretend",
+    "iso8601"
+]
+
 
-class cffi_build(build):
+class CFFIBuild(build):
     """
     This class exists, instead of just providing ``ext_modules=[...]`` directly
     in ``setup()`` because importing cryptography requires we have several
@@ -64,6 +71,19 @@ class cffi_build(build):
         build.finalize_options(self)
 
 
+class PyTest(test):
+    def finalize_options(self):
+        test.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        # Import here because in module scope the eggs are not loaded.
+        import pytest
+        errno = pytest.main(self.test_args)
+        sys.exit(errno)
+
+
 with open(os.path.join(base_dir, "README.rst")) as f:
     long_description = f.read()
 
@@ -105,11 +125,13 @@ setup(
 
     install_requires=requirements,
     setup_requires=requirements,
+    tests_require=test_requirements,
 
     # for cffi
     zip_safe=False,
     ext_package="cryptography",
     cmdclass={
-        "build": cffi_build,
+        "build": CFFIBuild,
+        "test": PyTest,
     }
 )