diff options
author | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:15:26 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:15:26 +0000 |
commit | 6b4e166f2475c4be0df7d82dc4d86aa43c6cb066 (patch) | |
tree | eb8f0fa0ed67f14cc5c5645f6bb12494e7966e98 /setup.py | |
parent | b6983c7c258a0ce3365f7c7409f2a06a8ed70bca (diff) | |
parent | 24ae6ba32069ca15f4a163e386964a3accdccf63 (diff) | |
download | python-urllib3-6b4e166f2475c4be0df7d82dc4d86aa43c6cb066.tar python-urllib3-6b4e166f2475c4be0df7d82dc4d86aa43c6cb066.tar.gz |
merge patched into master
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -6,9 +6,9 @@ import os import re try: - import setuptools + import setuptools # noqa: unused except ImportError: - pass # No 'develop' command, oh well. + pass # No 'develop' command, oh well. base_path = os.path.dirname(__file__) @@ -55,14 +55,11 @@ setup(name='urllib3', ], test_suite='test', extras_require={ - 'secure;python_version<="2.7"': [ - 'pyOpenSSL', + 'secure': [ + 'pyOpenSSL>=0.13', 'ndg-httpsclient', 'pyasn1', 'certifi', ], - 'secure;python_version>"2.7"': [ - 'certifi', - ], }, ) |