From aca78fe3f08ad31be2cc154301c95a318d74ead8 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 18 Apr 2012 14:47:51 -0400
Subject: break docs stuff out of testing to hopefully appease shiningpanda

---
 setup.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index e325b8a29..29a0f22ca 100644
--- a/setup.py
+++ b/setup.py
@@ -49,19 +49,22 @@ install_requires=[
     ]
 
 tests_require = [
+    'nose',
+    'coverage',
     'WebTest >= 1.3.1', # py3 compat
     'virtualenv',
     ]
 
 if not PY3:
     tests_require.extend([
-        'Sphinx',
-        'docutils',
-        'repoze.sphinx.autointerface',
         'zope.component>=3.11.0',
         ])
 
-testing_extras = tests_require + ['nose', 'coverage']
+docs_extras = [
+    'Sphinx',
+    'docutils',
+    'repoze.sphinx.autointerface',
+    ]
 
 setup(name='pyramid',
       version='1.4dev',
@@ -92,7 +95,8 @@ setup(name='pyramid',
       zip_safe=False,
       install_requires = install_requires,
       extras_require = {
-          'testing':testing_extras,
+          'testing':tests_require,
+          'docs':docs_extras,
           },
       tests_require = tests_require,
       test_suite="pyramid.tests",
-- 
cgit v1.2.3


From 90da3b3b1363beb443d190fdcdee8d9323beb64b Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 21 Apr 2012 12:11:59 -0400
Subject: make virtualenv, nose, and coverage testing extras rather than test
 requirements

---
 setup.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 29a0f22ca..cbc1075bd 100644
--- a/setup.py
+++ b/setup.py
@@ -49,16 +49,11 @@ install_requires=[
     ]
 
 tests_require = [
-    'nose',
-    'coverage',
     'WebTest >= 1.3.1', # py3 compat
-    'virtualenv',
     ]
 
 if not PY3:
-    tests_require.extend([
-        'zope.component>=3.11.0',
-        ])
+    tests_require.append('zope.component>=3.11.0')
 
 docs_extras = [
     'Sphinx',
@@ -66,6 +61,12 @@ docs_extras = [
     'repoze.sphinx.autointerface',
     ]
 
+testing_extras = tests_require + [
+    'nose',
+    'coverage',
+    'virtualenv', # for scaffolding tests
+    ]
+
 setup(name='pyramid',
       version='1.4dev',
       description=('The Pyramid web application development framework, a '
@@ -95,7 +96,7 @@ setup(name='pyramid',
       zip_safe=False,
       install_requires = install_requires,
       extras_require = {
-          'testing':tests_require,
+          'testing':testing_extras,
           'docs':docs_extras,
           },
       tests_require = tests_require,
-- 
cgit v1.2.3