mirror of
https://github.com/certbot/certbot.git
synced 2026-07-30 18:04:31 +02:00
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:
+4
-1
@@ -8,7 +8,6 @@ version = '0.14.0.dev0'
|
|||||||
|
|
||||||
# Please update tox.ini when modifying dependency version requirements
|
# Please update tox.ini when modifying dependency version requirements
|
||||||
install_requires = [
|
install_requires = [
|
||||||
'argparse',
|
|
||||||
# load_pem_private/public_key (>=0.6)
|
# load_pem_private/public_key (>=0.6)
|
||||||
# rsa_recover_prime_factors (>=0.8)
|
# rsa_recover_prime_factors (>=0.8)
|
||||||
'cryptography>=0.8',
|
'cryptography>=0.8',
|
||||||
@@ -28,6 +27,10 @@ install_requires = [
|
|||||||
'six',
|
'six',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# env markers cause problems with older pip and setuptools
|
||||||
|
if sys.version_info < (2, 7):
|
||||||
|
install_requires.append('argparse')
|
||||||
|
|
||||||
dev_extras = [
|
dev_extras = [
|
||||||
'nose',
|
'nose',
|
||||||
'tox',
|
'tox',
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ version = meta['version']
|
|||||||
# https://github.com/pypa/pip/issues/988 for more info.
|
# https://github.com/pypa/pip/issues/988 for more info.
|
||||||
install_requires = [
|
install_requires = [
|
||||||
'acme=={0}'.format(version),
|
'acme=={0}'.format(version),
|
||||||
'argparse',
|
|
||||||
# We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but
|
# 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
|
# 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.
|
# in which we added 2.6 support (see #2243), so we relax the requirement.
|
||||||
@@ -56,6 +55,10 @@ install_requires = [
|
|||||||
'zope.interface',
|
'zope.interface',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# env markers cause problems with older pip and setuptools
|
||||||
|
if sys.version_info < (2, 7):
|
||||||
|
install_requires.append('argparse')
|
||||||
|
|
||||||
dev_extras = [
|
dev_extras = [
|
||||||
# Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
|
# Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
|
||||||
'astroid==1.3.5',
|
'astroid==1.3.5',
|
||||||
|
|||||||
Reference in New Issue
Block a user