upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-03 22:08:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert moving mock to test_requires.

Browse source 
We'll take this up later, but I don't want to hold up the new le-auto on this debate.
This commit is contained in:
Erik Rose 2016-01-15 18:25:26 -05:00
parent 1706619886
commit e1bd1645b6
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
acme/setup.py
View file

@ -29,7 +29,10 @@ if sys.version_info < (2, 7):
install_requires.extend([
# only some distros recognize stdlib argparse as already satisfying
'argparse',
'mock<1.1.0',
])
else:
install_requires.append('mock')
docs_extras = [
'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags
@ -70,7 +73,6 @@ setup(
packages=find_packages(),
include_package_data=True,
install_requires=install_requires,
tests_require='mock<1.1.0' if sys.version_info < (2, 7) else 'mock',
extras_require={
'docs': docs_extras,
'testing': testing_extras,

4
setup.py
View file

@ -54,7 +54,10 @@ if sys.version_info < (2, 7):
install_requires.extend([
# only some distros recognize stdlib argparse as already satisfying
'argparse',
'mock<1.1.0',
])
else:
install_requires.append('mock')
dev_extras = [
# Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
@ -111,7 +114,6 @@ setup(
include_package_data=True,
install_requires=install_requires,
tests_require='mock<1.1.0' if sys.version_info < (2, 7) else 'mock',
extras_require={
'dev': dev_extras,
'docs': docs_extras,