[Checkins] SVN: zc.catalog/trunk/ Removed zope.app.server test dependency

[Gediminas Paulauskas]

Log message for revision 124099:
  Removed zope.app.server test dependency
  
  Tests need zope.testing < 4 because of doctest.INTERPRET_FOOTNOTES
  
  

Changed:
  U   zc.catalog/trunk/CHANGES.txt
  U   zc.catalog/trunk/buildout.cfg
  U   zc.catalog/trunk/setup.py
  U   zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml

-=-
Modified: zc.catalog/trunk/CHANGES.txt
===================================================================
--- zc.catalog/trunk/CHANGES.txt	2012-01-20 18:32:35 UTC (rev 124098)
+++ zc.catalog/trunk/CHANGES.txt	2012-01-20 18:48:53 UTC (rev 124099)
@@ -11,8 +11,12 @@
 - Fix the extent catalog's `searchResults` method to work when using a
   local uid source.
 
-- Replaced a testing dependency on zope.app.authentication with zope.password.
+- Replaced a testing dependency on ``zope.app.authentication`` with
+  ``zope.password``.
 
+- Removed ``zope.app.server`` test dependency.
+
+
 1.5 (2010-10-19)
 ----------------
 

Modified: zc.catalog/trunk/buildout.cfg
===================================================================
--- zc.catalog/trunk/buildout.cfg	2012-01-20 18:32:35 UTC (rev 124098)
+++ zc.catalog/trunk/buildout.cfg	2012-01-20 18:48:53 UTC (rev 124099)
@@ -1,13 +1,13 @@
 [buildout]
-extends =
-    http://download.zope.org/zopetoolkit/index/1.0.1/zopeapp-versions.cfg
-    http://download.zope.org/zopetoolkit/index/1.0.1/ztk-versions.cfg
 parts =
   test
   test_no_browser
 versions = versions
 develop = .
 
+[versions]
+zope.testing = 3.10.3
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = zc.catalog [test, browser, test_browser]

Modified: zc.catalog/trunk/setup.py
===================================================================
--- zc.catalog/trunk/setup.py	2012-01-20 18:32:35 UTC (rev 124098)
+++ zc.catalog/trunk/setup.py	2012-01-20 18:48:53 UTC (rev 124099)
@@ -69,9 +69,7 @@
           test=[
               'zope.intid',
               'zope.keyreference',
-              'zope.securitypolicy',
-              'zope.testbrowser',
-              'zope.testing',
+              'zope.testing < 4',
               ],
           browser=[
               'zope.app.form',
@@ -80,9 +78,10 @@
           test_browser=[
               'zope.login',
               'zope.password',
+              'zope.securitypolicy',
+              'zope.testbrowser',
               'zope.app.appsetup',
               'zope.app.catalog',
-              'zope.app.server',
               'zope.app.testing',
               'zope.app.zcmlfiles',
               ]),

Modified: zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml	2012-01-20 18:32:35 UTC (rev 124098)
+++ zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml	2012-01-20 18:48:53 UTC (rev 124099)
@@ -6,7 +6,6 @@
     >
 
   <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.server" />
   <include package="zope.keyreference" />
   <include package="zope.intid" />
   <include package="zope.app.catalog" />