[Checkins] SVN: zope.publisher/trunk/ move zope.testing to main dependencies, and remove zope.app.testing as (any kind of) dependency.

[Gary Poster]

Log message for revision 97600:
  move zope.testing to main dependencies, and remove zope.app.testing as (any kind of) dependency.

Changed:
  U   zope.publisher/trunk/CHANGES.txt
  U   zope.publisher/trunk/buildout.cfg
  U   zope.publisher/trunk/setup.py
  U   zope.publisher/trunk/src/zope/publisher/tests/test_browser.py

-=-
Modified: zope.publisher/trunk/CHANGES.txt
===================================================================
--- zope.publisher/trunk/CHANGES.txt	2009-03-06 18:10:03 UTC (rev 97599)
+++ zope.publisher/trunk/CHANGES.txt	2009-03-06 19:58:44 UTC (rev 97600)
@@ -33,6 +33,10 @@
 
 - Remove deprecated code.
 
+- Clean-up: Move "zope.testing" from extras to dependencies, per Zope
+  Framework policy.  Remove zope.app.testing as a dependency: tests run fine
+  without it.
+
 3.5.6 (2009-02-14)
 ------------------
 

Modified: zope.publisher/trunk/buildout.cfg
===================================================================
--- zope.publisher/trunk/buildout.cfg	2009-03-06 18:10:03 UTC (rev 97599)
+++ zope.publisher/trunk/buildout.cfg	2009-03-06 19:58:44 UTC (rev 97600)
@@ -4,4 +4,4 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.publisher [test]
+eggs = zope.publisher

Modified: zope.publisher/trunk/setup.py
===================================================================
--- zope.publisher/trunk/setup.py	2009-03-06 18:10:03 UTC (rev 97599)
+++ zope.publisher/trunk/setup.py	2009-03-06 19:58:44 UTC (rev 97600)
@@ -48,11 +48,8 @@
                         'zope.interface',
                         'zope.location',
                         'zope.proxy',
-                        'zope.security'],
-      extras_require=dict(
-          test=['zope.testing',
-                'zope.app.testing'],
-          ),
+                        'zope.security',
+                        'zope.testing'],
       include_package_data=True,
 
       zip_safe=False,

Modified: zope.publisher/trunk/src/zope/publisher/tests/test_browser.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/tests/test_browser.py	2009-03-06 18:10:03 UTC (rev 97599)
+++ zope.publisher/trunk/src/zope/publisher/tests/test_browser.py	2009-03-06 19:58:44 UTC (rev 97600)
@@ -17,15 +17,12 @@
 """
 import unittest
 from zope.testing.doctestunit import DocTestSuite
-from zope.app.testing import setup
 
 __docformat__ = "reStructuredText"
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('zope.publisher.browser',
-                     setUp=setup.placelessSetUp,
-                     tearDown=setup.placelessTearDown),
+        DocTestSuite('zope.publisher.browser'),
         ))
 
 if __name__ == '__main__':