Reuse dynamic install_requires. (#4554)

* Revert "Make argparse dependency unconditional. (#2249)"

  This reverts commit 8f10103496.

* Update comment about environment markers
This commit is contained in:
Brad Warren 2017-04-28 15:03:50 -07:00 committed by GitHub
parent 72fa27514e
commit 89af460792
2 changed files with 8 additions and 2 deletions

View file

@ -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',

View file

@ -36,7 +36,6 @@ version = meta['version']
# https://github.com/pypa/pip/issues/988 for more info.
install_requires = [
'acme=={0}'.format(version),
'argparse',
# We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but
# saying so here causes a runtime error against our temporary fork of 0.9.3
# in which we added 2.6 support (see #2243), so we relax the requirement.
@ -56,6 +55,10 @@ install_requires = [
'zope.interface',
]
# env markers cause problems with older pip and setuptools
if sys.version_info < (2, 7):
install_requires.append('argparse')
dev_extras = [
# Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
'astroid==1.3.5',