[Checkins] SVN: zope.app.appsetup/trunk/ merged r116888 here which accidently went to branches/3.14

Michael Howitz mh at gocept.com
Sat Sep 25 09:11:48 EDT 2010


Log message for revision 116897:
  merged r116888 here which accidently went to branches/3.14
  

Changed:
  U   zope.app.appsetup/trunk/CHANGES.txt
  U   zope.app.appsetup/trunk/setup.py
  U   zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py

-=-
Modified: zope.app.appsetup/trunk/CHANGES.txt
===================================================================
--- zope.app.appsetup/trunk/CHANGES.txt	2010-09-25 13:07:15 UTC (rev 116896)
+++ zope.app.appsetup/trunk/CHANGES.txt	2010-09-25 13:11:48 UTC (rev 116897)
@@ -4,17 +4,21 @@
 3.15.0 (unreleased)
 -------------------
 
-- Update tests according to zope.testrunner changes.
+- Updated tests to run with `zope.testing >= 3.10`, requiring at least this
+  version and `zope.testrunner`.
 
-- Switch IErrorReportingUtility copy_to_zlog field to ``True``.
+- Switch ``IErrorReportingUtility copy_to_zlog`` field to ``True``.
 
+- Using Python's `doctest` module instead of depreacted
+  `zope.testing.doctest`.
 
+
 3.14.0 (2010-04-13)
 -------------------
 
-- make zope.testing an optional (test) dependency.
+- Made `zope.testing` an optional (test) dependency.
 
-- remove test dependency zope.app.testing.
+- Removed test dependency on `zope.app.testing`.
 
 
 3.13.0 (2009-12-24)

Modified: zope.app.appsetup/trunk/setup.py
===================================================================
--- zope.app.appsetup/trunk/setup.py	2010-09-25 13:07:15 UTC (rev 116896)
+++ zope.app.appsetup/trunk/setup.py	2010-09-25 13:11:48 UTC (rev 116897)
@@ -66,7 +66,7 @@
         test=[
             'zope.componentvocabulary',
             'zope.principalregistry',
-            'zope.testing>=3.10.0',
+            'zope.testing >= 3.10',
             'zope.testrunner',
             ]
         ),

Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py	2010-09-25 13:07:15 UTC (rev 116896)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py	2010-09-25 13:11:48 UTC (rev 116897)
@@ -16,16 +16,16 @@
 $Id$
 """
 import ZConfig
+import doctest
 import os
 import sys
+import transaction
 import unittest
 import urllib
-import transaction
 
 import zope.component
 
 from ZODB.tests.util import DB
-from zope.testing import doctest
 from zope.traversing.api import traverse, getPath
 from zope.error.interfaces import IErrorReportingUtility
 from zope.error.error import ErrorReportingUtility



More information about the checkins mailing list