Merge remote-tracking branch 'github/letsencrypt/master' into mock-2.6

This commit is contained in:
Jakub Warmuz
2015-10-04 08:41:01 +00:00
117 changed files with 2079 additions and 1750 deletions
+4 -3
View File
@@ -40,6 +40,8 @@ install_requires = [
'pyrfc3339',
'python2-pythondialog>=3.2.2rc1', # Debian squeeze support, cf. #280
'pytz',
'requests',
'setuptools', # pkg_resources
'zope.component',
'zope.interface',
]
@@ -71,6 +73,7 @@ testing_extras = [
'coverage',
'nose',
'nosexcover',
'pep8',
'tox',
]
@@ -90,7 +93,6 @@ setup(
'Operating System :: POSIX :: Linux',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Security',
@@ -119,8 +121,7 @@ setup(
'letsencrypt-renewer = letsencrypt.renewer:main',
],
'letsencrypt.plugins': [
'manual = letsencrypt.plugins.manual:ManualAuthenticator',
# TODO: null should probably not be presented to the user
'manual = letsencrypt.plugins.manual:Authenticator',
'null = letsencrypt.plugins.null:Installer',
'standalone = letsencrypt.plugins.standalone.authenticator'
':StandaloneAuthenticator',