[Checkins] SVN: zope.index/trunk/ Remove zope.testing test dependency

Gediminas Paulauskas menesis at pov.lt
Tue Jan 3 15:02:17 UTC 2012


Log message for revision 123927:
  Remove zope.testing test dependency

Changed:
  U   zope.index/trunk/CHANGES.txt
  U   zope.index/trunk/setup.py
  U   zope.index/trunk/src/zope/index/field/tests.py
  U   zope.index/trunk/src/zope/index/text/tests/test_textindexwrapper.py

-=-
Modified: zope.index/trunk/CHANGES.txt
===================================================================
--- zope.index/trunk/CHANGES.txt	2012-01-03 14:53:55 UTC (rev 123926)
+++ zope.index/trunk/CHANGES.txt	2012-01-03 15:02:17 UTC (rev 123927)
@@ -1,6 +1,11 @@
 Changes
 =======
 
+3.6.4 (unreleased)
+------------------
+
+- Use the standard Python doctest module instead of zope.testing.doctest
+
 3.6.3 (2011-12-03)
 ------------------
 

Modified: zope.index/trunk/setup.py
===================================================================
--- zope.index/trunk/setup.py	2012-01-03 14:53:55 UTC (rev 123926)
+++ zope.index/trunk/setup.py	2012-01-03 15:02:17 UTC (rev 123927)
@@ -71,9 +71,9 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope',],
-      extras_require={'test': ['zope.testing']},
+      extras_require={'test': []},
       install_requires=['setuptools',
-                        'ZODB3>=3.8.0b1',
+                        'ZODB3>=3.8',
                         'zope.interface'],
       include_package_data = True,
       ext_modules=[

Modified: zope.index/trunk/src/zope/index/field/tests.py
===================================================================
--- zope.index/trunk/src/zope/index/field/tests.py	2012-01-03 14:53:55 UTC (rev 123926)
+++ zope.index/trunk/src/zope/index/field/tests.py	2012-01-03 15:02:17 UTC (rev 123927)
@@ -14,6 +14,7 @@
 """Test field index
 """
 import unittest
+import doctest
 
 _marker = object()
 
@@ -311,7 +312,6 @@
         self.assertRaises(ValueError, list, result)
 
 def test_suite():
-    from zope.testing import doctest
     return unittest.TestSuite((
         doctest.DocFileSuite('README.txt', optionflags=doctest.ELLIPSIS),
         unittest.makeSuite(FieldIndexTests),

Modified: zope.index/trunk/src/zope/index/text/tests/test_textindexwrapper.py
===================================================================
--- zope.index/trunk/src/zope/index/text/tests/test_textindexwrapper.py	2012-01-03 14:53:55 UTC (rev 123926)
+++ zope.index/trunk/src/zope/index/text/tests/test_textindexwrapper.py	2012-01-03 15:02:17 UTC (rev 123927)
@@ -13,8 +13,7 @@
 ##############################################################################
 """Unit tests for TextIndexWrapper.
 """
-import unittest
-from zope.testing import doctest
+import doctest
 
 def test_suite():
     return doctest.DocFileSuite("../textindex.txt")



More information about the checkins mailing list