Merge 5c478bf into cdaf3ff

CHANGELOG.rst

@@ -9,6 +9,7 @@ Changelog
 * **BACKWARDS INCOMPATIBLE:** ``Whirlpool``, ``RIPEMD160``, and
   ``UnsupportedExtension`` have been removed in accordance with our
   :doc:`/api-stability` policy.
+* Installing ``cryptography`` now requires ``pip`` 6 or newer.
 * Deprecated passing unicode to the :class:`~cryptography.x509.DNSName`
   constructor. Instead, users should pass DNS names as ``bytes``, with ``idna``
   encoding if necessary. In addition, the

setup.py

@@ -33,25 +33,15 @@
 
 VECTORS_DEPENDENCY = "cryptography_vectors=={0}".format(about['__version__'])
 
-requirements = [
-    "idna>=2.1",
-    "asn1crypto>=0.21.0",
-    "six>=1.4.1",
-]
 setup_requirements = []
 
-if sys.version_info < (3,):
-    requirements.append("enum34")
-    requirements.append("ipaddress")
-
 if platform.python_implementation() == "PyPy":
     if sys.pypy_version_info < (5, 3):
         raise RuntimeError(
             "cryptography 1.9 is not compatible with PyPy < 5.3. Please "
             "upgrade PyPy to use this library."
         )
 else:
-    requirements.append("cffi>=1.7")
     setup_requirements.append("cffi>=1.7")
 
 test_requirements = [
@@ -285,9 +275,16 @@ def run_tests(self):
     packages=find_packages(where="src", exclude=["_cffi_src", "_cffi_src.*"]),
     include_package_data=True,
 
-    install_requires=requirements,
+    install_requires=[
+        "idna >= 2.1",
+        "asn1crypto >= 0.21.0",
+        "six >= 1.4.1",
+    ],
     tests_require=test_requirements,
     extras_require={
+        ":python_version < '3'": ["enum34", "ipaddress"],
+        ":python_implementation != 'PyPy'": ["cffi >= 1.7"],
+
         "test": test_requirements,
         "docstest": [
             "doc8",