diff options
author | Brad Warren <bmw@users.noreply.github.com> | 2017-04-29 01:03:50 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-29 01:03:50 +0300 |
commit | 89af460792fcdfb23c7dc4f9fcdec1bfa07a2656 (patch) | |
tree | e5e06f43628a7cd9ccab18de47b545a931bf41e5 /acme | |
parent | 72fa27514e1b212fa59635ecc05acedffaa631fb (diff) |
Reuse dynamic install_requires. (#4554)
* Revert "Make argparse dependency unconditional. (#2249)"
This reverts commit 8f101034960ffc1e47879314585898efda234e60.
* Update comment about environment markers
Diffstat (limited to 'acme')
-rw-r--r-- | acme/setup.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/acme/setup.py b/acme/setup.py index a640ae6bb..1c887e5d3 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -8,7 +8,6 @@ version = '0.14.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'argparse', # load_pem_private/public_key (>=0.6) # rsa_recover_prime_factors (>=0.8) 'cryptography>=0.8', @@ -28,6 +27,10 @@ install_requires = [ 'six', ] +# env markers cause problems with older pip and setuptools +if sys.version_info < (2, 7): + install_requires.append('argparse') + dev_extras = [ 'nose', 'tox', |