[Checkins] SVN: zope.server/branches/3.6/ Make tests runnable via buildout, merge r116825

[Gediminas Paulauskas]

Log message for revision 121876:
  Make tests runnable via buildout, merge r116825
  

Changed:
  U   zope.server/branches/3.6/buildout.cfg
  U   zope.server/branches/3.6/setup.py

-=-
Modified: zope.server/branches/3.6/buildout.cfg
===================================================================
--- zope.server/branches/3.6/buildout.cfg	2011-06-07 16:56:38 UTC (rev 121875)
+++ zope.server/branches/3.6/buildout.cfg	2011-06-07 17:10:57 UTC (rev 121876)
@@ -10,4 +10,4 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.server
+eggs = zope.server [test]

Modified: zope.server/branches/3.6/setup.py
===================================================================
--- zope.server/branches/3.6/setup.py	2011-06-07 16:56:38 UTC (rev 121875)
+++ zope.server/branches/3.6/setup.py	2011-06-07 17:10:57 UTC (rev 121876)
@@ -24,6 +24,14 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+
+tests_require = [
+    'zope.testing',
+    'zope.i18n',
+    'zope.component',
+    ]
+
+
 setup(
     name='zope.server',
     version = '3.6.3dev',
@@ -51,17 +59,17 @@
     packages=find_packages('src'),
     package_dir = {'': 'src'},
     namespace_packages=['zope',],
-    tests_require = ['zope.testing',
-                     'zope.i18n',
-                     'zope.component'],
-    install_requires = ['setuptools',
-                        'zope.interface',
-                        'zope.publisher',
-                        'zope.security',
-                        ],
-    include_package_data = True,
-    zip_safe = False,
-    entry_points = """
+    tests_require=tests_require,
+    install_requires=[
+        'setuptools',
+        'zope.interface',
+        'zope.publisher',
+        'zope.security',
+        ],
+    extras_require=dict(test=tests_require),
+    include_package_data=True,
+    zip_safe=False,
+    entry_points="""
     [paste.server_runner]
     main = zope.server.http.wsgihttpserver:run_paste
     """