diff options
author | Brad Warren <bradmw@umich.edu> | 2016-01-08 22:27:07 +0300 |
---|---|---|
committer | Brad Warren <bradmw@umich.edu> | 2016-01-08 22:27:07 +0300 |
commit | 36679c2daa79cf53a194c934b645b7b515b42788 (patch) | |
tree | 548fa5022715a7f9d9352b8e2065b3c8e4c88f53 /setup.py | |
parent | a7a7380110a50257c9d161052cc21cd52f299021 (diff) | |
parent | 67b01d328c6cdd82895e386b3ecc14e060b96b2f (diff) |
Merge branch 'master' into pyopenssl
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -34,7 +34,7 @@ version = meta['version'] install_requires = [ 'acme=={0}'.format(version), 'configobj', - 'cryptography>=0.7', # load_pem_x509_certificate + 'cryptography>=0.7,<1.2', # load_pem_x509_certificate 'parsedatetime', 'psutil>=2.1.0', # net_connections introduced in 2.1.0 'PyOpenSSL', |