From c75e507c7eab84e317588823b6a0e332561212ef Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 17 Mar 2012 16:32:00 -0400
Subject: dont depend on nose or coverage except for in extras

---
 setup.py | 6 +++---
 tox.ini  | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 5282ee64f..45f556e67 100644
--- a/setup.py
+++ b/setup.py
@@ -49,8 +49,6 @@ install_requires=[
     ]
 
 tests_require = [
-    'nose',
-    'coverage',
     'WebTest >= 1.3.1', # py3 compat
     'virtualenv',
     ]
@@ -63,6 +61,8 @@ if not PY3:
         'zope.component>=3.11.0',
         ])
 
+testing_extras = tests_require + ['nose', 'coverage']
+
 setup(name='pyramid',
       version='1.3b2',
       description=('The Pyramid web application development framework, a '
@@ -92,7 +92,7 @@ setup(name='pyramid',
       zip_safe=False,
       install_requires = install_requires,
       extras_require = {
-          'testing':tests_require,
+          'testing':testing_extras,
           },
       tests_require = tests_require,
       test_suite="pyramid.tests",
diff --git a/tox.ini b/tox.ini
index 4e732a178..97aa6c4d0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,8 +12,6 @@ deps =
     WebTest
     virtualenv
     venusian
-    nose
-    coverage
 
 [testenv:py32]
 commands = 
@@ -22,8 +20,6 @@ deps =
     WebTest
     virtualenv
     venusian
-    nose
-    coverage
 
 [testenv:cover]
 basepython =
-- 
cgit v1.2.3