diff options
| author | Jakub Warmuz <jakub@warmuz.org> | 2015-10-04 11:41:01 +0300 |
|---|---|---|
| committer | Jakub Warmuz <jakub@warmuz.org> | 2015-10-04 11:41:01 +0300 |
| commit | 3f08932479f83ad6de765eba0655e26e4e0ef478 (patch) | |
| tree | 7274207f6d055eabc9b39c0685b9b3473538eb8e /setup.py | |
| parent | a74eff5fbd4f68a584bff9d2805f28954d95f978 (diff) | |
| parent | 74b2e3bc515b5f7e805883a26f1b0e47ed686098 (diff) | |
Merge remote-tracking branch 'github/letsencrypt/master' into mock-2.6
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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', |