diff options
author | Jakub Warmuz <jakub@warmuz.org> | 2015-07-18 09:51:26 +0300 |
---|---|---|
committer | Jakub Warmuz <jakub@warmuz.org> | 2015-07-18 09:51:26 +0300 |
commit | 33d7f205fadfb6046c8481ca00ba4f4244c69ed7 (patch) | |
tree | 2d371110b4ab6366885245a5970e9490b502b958 /setup.py | |
parent | d7d98d79ce45c7ea3793227835b2b7efaa313ee0 (diff) | |
parent | 4543f7956c11e7d98f23283a93701247d6d87736 (diff) |
Merge remote-tracking branch 'github/letsencrypt/master' into dvsni-verify
Conflicts:
acme/acme/challenges.py
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,7 @@ import codecs import os import re +import sys from setuptools import setup from setuptools import find_packages @@ -30,7 +31,6 @@ changes = read_file(os.path.join(here, 'CHANGES.rst')) install_requires = [ 'acme', - 'argparse', 'ConfigArgParse', 'configobj', 'cryptography>=0.7', # load_pem_x509_certificate @@ -45,6 +45,11 @@ install_requires = [ 'zope.interface', ] +# env markers in extras_require cause problems with older pip: #517 +if sys.version_info < (2, 7): + # only some distros recognize stdlib argparse as already satisfying + install_requires.append('argparse') + dev_extras = [ # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289 'astroid==1.3.5', |