[Checkins] SVN: z3c.rmldocument/trunk/ - Added test extra to declare test dependency on ``zope.testing``.

[Michael Howitz]

Log message for revision 117265:
  - Added test extra to declare test dependency on ``zope.testing``.
  
  - Using Python's ``doctest`` module instead of depreacted
    ``zope.testing.doctest``.
  
  

Changed:
  U   z3c.rmldocument/trunk/CHANGES.txt
  U   z3c.rmldocument/trunk/buildout.cfg
  U   z3c.rmldocument/trunk/setup.py
  U   z3c.rmldocument/trunk/src/z3c/rmldocument/tests.py

-=-
Modified: z3c.rmldocument/trunk/CHANGES.txt
===================================================================
--- z3c.rmldocument/trunk/CHANGES.txt	2010-10-06 06:22:49 UTC (rev 117264)
+++ z3c.rmldocument/trunk/CHANGES.txt	2010-10-06 06:27:05 UTC (rev 117265)
@@ -5,9 +5,12 @@
 1.1 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Added test extra to declare test dependency on ``zope.testing``.
 
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
 
+
 1.0 (2010-04-16)
 ----------------
 

Modified: z3c.rmldocument/trunk/buildout.cfg
===================================================================
--- z3c.rmldocument/trunk/buildout.cfg	2010-10-06 06:22:49 UTC (rev 117264)
+++ z3c.rmldocument/trunk/buildout.cfg	2010-10-06 06:27:05 UTC (rev 117265)
@@ -1,10 +1,14 @@
 [buildout]
 parts = lxml test
 develop = .
+versions = versions
 
+[versions]
+lxml = 2.2.8
+
 [test]
 recipe = zc.recipe.testrunner
-eggs = z3c.rmldocument
+eggs = z3c.rmldocument [test]
 
 [lxml]
 recipe = z3c.recipe.staticlxml

Modified: z3c.rmldocument/trunk/setup.py
===================================================================
--- z3c.rmldocument/trunk/setup.py	2010-10-06 06:22:49 UTC (rev 117264)
+++ z3c.rmldocument/trunk/setup.py	2010-10-06 06:27:05 UTC (rev 117265)
@@ -48,6 +48,10 @@
         'setuptools',
         'lxml',
         ],
+    extras_require=dict(
+        test=[
+            'zope.testing',
+            ]),
     include_package_data = True,
     zip_safe = False,
     )

Modified: z3c.rmldocument/trunk/src/z3c/rmldocument/tests.py
===================================================================
--- z3c.rmldocument/trunk/src/z3c/rmldocument/tests.py	2010-10-06 06:22:49 UTC (rev 117264)
+++ z3c.rmldocument/trunk/src/z3c/rmldocument/tests.py	2010-10-06 06:27:05 UTC (rev 117265)
@@ -11,22 +11,19 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Test harness for z3c.rmldocument
+"""Test harness for z3c.rmldocument."""
 
-$Id: interfaces.py 74195 2007-04-16 22:41:24Z srichter $
-"""
-
+import doctest
 import os.path
 import unittest
-from zope.testing import doctest
 
 
 def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(doctest.DocFileSuite(
+    return doctest.DocFileSuite(
         'README.txt',
-        optionflags=doctest.ELLIPSIS|doctest.REPORT_NDIFF|doctest.NORMALIZE_WHITESPACE,
-        globs={'EXAMPLE': 
+        optionflags=(doctest.ELLIPSIS|
+                     doctest.REPORT_NDIFF|
+                     doctest.NORMALIZE_WHITESPACE),
+        globs={'EXAMPLE':
                os.path.join(os.path.dirname(__file__), 'examples',
-                            'example%s.rml')}))
-    return suite
+                            'example%s.rml')})