Merge pull request #2121 from letsencrypt/revert-2120-cryptography_fix

Revert "Don't use cryptography version 1.2"
This commit is contained in:
bmw 2016-01-08 18:36:03 -05:00
commit 1a2f42d7d7
2 changed files with 2 additions and 2 deletions

View file

@ -9,7 +9,7 @@ version = '0.2.0.dev0'
install_requires = [
# load_pem_private/public_key (>=0.6)
# rsa_recover_prime_factors (>=0.8)
'cryptography>=0.8,<1.2',
'cryptography>=0.8',
# Connection.set_tlsext_host_name (>=0.13), X509Req.get_extensions (>=0.15)
'PyOpenSSL>=0.15',
'pyrfc3339',

View file

@ -33,7 +33,7 @@ version = meta['version']
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',