starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 08:08:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2182 from letsencrypt/revert-conditional-deps

Browse Source 
Always install ndg-httpsclient and pyasn1
This commit is contained in:
Peter Eckersley
2016-01-14 13:59:58 -08:00
parent 7e741f9b1a 5d93678303
commit a401384d62
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acme/setup.py
+2 -5
View File
@@ -11,6 +11,8 @@ install_requires = [
# load_pem_private/public_key (>=0.6) # load_pem_private/public_key (>=0.6)
# rsa_recover_prime_factors (>=0.8) # rsa_recover_prime_factors (>=0.8)
'cryptography>=0.8', 'cryptography>=0.8',
'ndg-httpsclient', # urllib3 InsecurePlatformWarning (#304)
'pyasn1', # urllib3 InsecurePlatformWarning (#304)
# Connection.set_tlsext_host_name (>=0.13) # Connection.set_tlsext_host_name (>=0.13)
'PyOpenSSL>=0.13', 'PyOpenSSL>=0.13',
'pyrfc3339', 'pyrfc3339',
@@ -31,11 +33,6 @@ if sys.version_info < (2, 7):
else: else:
install_requires.append('mock') install_requires.append('mock')
if sys.version_info < (2, 7, 9):
# For secure SSL connection with Python 2.7 (InsecurePlatformWarning)
install_requires.append('ndg-httpsclient')
install_requires.append('pyasn1')
docs_extras = [ docs_extras = [
'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags
'sphinx_rtd_theme', 'sphinx_rtd_theme',
setup.py
+1 -2
View File
@@ -33,6 +33,7 @@ version = meta['version']
# Please update tox.ini when modifying dependency version requirements # Please update tox.ini when modifying dependency version requirements
install_requires = [ install_requires = [
'acme=={0}'.format(version), 'acme=={0}'.format(version),
'ConfigArgParse>=0.10.0', # python2.6 support, upstream #17
'configobj', 'configobj',
'cryptography>=0.7', # load_pem_x509_certificate 'cryptography>=0.7', # load_pem_x509_certificate
'parsedatetime', 'parsedatetime',
@@ -52,12 +53,10 @@ if sys.version_info < (2, 7):
install_requires.extend([ install_requires.extend([
# only some distros recognize stdlib argparse as already satisfying # only some distros recognize stdlib argparse as already satisfying
'argparse', 'argparse',
'ConfigArgParse>=0.10.0', # python2.6 support, upstream #17
'mock<1.1.0', 'mock<1.1.0',
]) ])
else: else:
install_requires.extend([ install_requires.extend([
'ConfigArgParse',
'mock', 'mock',
]) ])