From e1bd1645b6340e4a6ad7cb655af4aa6bb9d19945 Mon Sep 17 00:00:00 2001
From: Erik Rose <erik@mozilla.com>
Date: Fri, 15 Jan 2016 18:25:26 -0500
Subject: [PATCH] Revert moving mock to test_requires.

We'll take this up later, but I don't want to hold up the new le-auto on this debate.
---
 acme/setup.py | 4 +++-
 setup.py      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/acme/setup.py b/acme/setup.py
index 36a5d5d0c..53f906629 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -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,
diff --git a/setup.py b/setup.py
index fd44bd5b2..647bfb8d2 100644
--- a/setup.py
+++ b/setup.py
@@ -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,