Master master into letsencrypt-auto-release so Travis will build it.

This commit is contained in:
Erik Rose
2016-01-11 21:45:16 -05:00
46 changed files with 899 additions and 151 deletions
+2 -1
View File
@@ -30,10 +30,11 @@ readme = read_file(os.path.join(here, 'README.rst'))
changes = read_file(os.path.join(here, 'CHANGES.rst'))
version = meta['version']
# Please update tox.ini when modifying dependency version requirements
install_requires = [
'acme=={0}'.format(version),
'configobj',
'cryptography>=0.7,<1.2', # load_pem_x509_certificate
'cryptography>=0.7', # load_pem_x509_certificate
'parsedatetime',
'psutil>=2.1.0', # net_connections introduced in 2.1.0
'PyOpenSSL',