diff options
author | Erik Rose <erik@mozilla.com> | 2016-01-15 21:43:36 +0300 |
---|---|---|
committer | Erik Rose <erik@mozilla.com> | 2016-01-15 21:43:36 +0300 |
commit | ecbe2a5c699ec40de1fcbe9c83b6ff46e62659d8 (patch) | |
tree | 4774cb4c9e21e504deaae70109aaacf8e78b3be5 /setup.py | |
parent | 2771249522c32cd7c2dab65fe15dcdfd9ad4b7d7 (diff) | |
parent | b0303414155ffdbad57c05c578460ff42e424856 (diff) |
Merge master in to get the unconditionalization of dependencies.
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -33,6 +33,7 @@ version = meta['version'] # Please update tox.ini when modifying dependency version requirements install_requires = [ 'acme=={0}'.format(version), + 'ConfigArgParse>=0.10.0', # python2.6 support, upstream #17 'configobj', 'cryptography>=0.7', # load_pem_x509_certificate 'parsedatetime', @@ -53,11 +54,6 @@ if sys.version_info < (2, 7): install_requires.extend([ # only some distros recognize stdlib argparse as already satisfying 'argparse', - 'ConfigArgParse>=0.10.0', # python2.6 support, upstream #17 - ]) -else: - install_requires.extend([ - 'ConfigArgParse', ]) dev_extras = [ |