[Checkins] SVN: z3c.recipe.filetemplate/trunk/ - Added undeclared but necessary test dependency on `zope.testing` in a

[Michael Howitz]

Log message for revision 116122:
  - Added undeclared but necessary test dependency on `zope.testing` in a
    test extra.
  
  - Added test dependency on `z3c.recipe.scripts` as it is required by newer
    `zc.buildout` versions.
  
  - Using python's `doctest` module instead of deprecated
    `zope.testing.doctest`.
  

Changed:
  U   z3c.recipe.filetemplate/trunk/CHANGES.txt
  U   z3c.recipe.filetemplate/trunk/buildout.cfg
  U   z3c.recipe.filetemplate/trunk/setup.py
  U   z3c.recipe.filetemplate/trunk/z3c/recipe/filetemplate/tests.py

-=-
Modified: z3c.recipe.filetemplate/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.filetemplate/trunk/CHANGES.txt	2010-09-02 06:14:43 UTC (rev 116121)
+++ z3c.recipe.filetemplate/trunk/CHANGES.txt	2010-09-02 06:26:30 UTC (rev 116122)
@@ -2,7 +2,7 @@
 Changes
 =======
 
-2.1.0 (Unreleased)
+2.1.1 (Unreleased)
 ==================
 
 --------
@@ -13,6 +13,15 @@
 Fixes
 -----
 
+- Added undeclared but necessary test dependency on `zope.testing` in a
+  test extra.
+
+- Added test dependency on `z3c.recipe.scripts` as it is required by newer
+  `zc.buildout` versions.
+
+- Using python's `doctest` module instead of deprecated
+  `zope.testing.doctest`.
+
 2.1.0 (2010-04-21)
 ==================
 

Modified: z3c.recipe.filetemplate/trunk/buildout.cfg
===================================================================
--- z3c.recipe.filetemplate/trunk/buildout.cfg	2010-09-02 06:14:43 UTC (rev 116121)
+++ z3c.recipe.filetemplate/trunk/buildout.cfg	2010-09-02 06:26:30 UTC (rev 116122)
@@ -5,7 +5,7 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = z3c.recipe.filetemplate
+eggs = z3c.recipe.filetemplate [test]
 
 [interpreter]
 recipe = zc.recipe.egg

Modified: z3c.recipe.filetemplate/trunk/setup.py
===================================================================
--- z3c.recipe.filetemplate/trunk/setup.py	2010-09-02 06:14:43 UTC (rev 116121)
+++ z3c.recipe.filetemplate/trunk/setup.py	2010-09-02 06:26:30 UTC (rev 116122)
@@ -45,6 +45,12 @@
                         'zc.buildout',
                         'zc.recipe.egg',
                         ],
+      extras_require = dict(
+          test = [
+              'zope.testing',
+              'z3c.recipe.scripts',
+              ]
+          ),
       zip_safe=True,
       entry_points="""
       [zc.buildout]

Modified: z3c.recipe.filetemplate/trunk/z3c/recipe/filetemplate/tests.py
===================================================================
--- z3c.recipe.filetemplate/trunk/z3c/recipe/filetemplate/tests.py	2010-09-02 06:14:43 UTC (rev 116121)
+++ z3c.recipe.filetemplate/trunk/z3c/recipe/filetemplate/tests.py	2010-09-02 06:26:30 UTC (rev 116122)
@@ -12,11 +12,11 @@
 #
 ##############################################################################
 
+import doctest
 import os
 import time
 import zc.buildout.testing
 import zc.buildout.tests
-from zope.testing import doctest
 
 
 def update_file(dir, *args):