[Checkins] SVN: grok/trunk/ Splitted out test dependencies.

[Reinout van Rees]

Log message for revision 106889:
  Splitted out test dependencies.
  Added z3c.recipe.compattest to the buildout (bin/compattest) to test grok and ALL dependencies.
  Needed to update compattest's version in versions.cfg compared to the ZTK for that.  Seems OK to do.

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/buildout.cfg
  U   grok/trunk/setup.py
  U   grok/trunk/versions.cfg

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2009-12-22 16:17:04 UTC (rev 106888)
+++ grok/trunk/CHANGES.txt	2009-12-22 16:51:33 UTC (rev 106889)
@@ -4,6 +4,9 @@
 1.1a2 (unreleased)
 ==================
 
+* Updated z3c.recipe.compattest's version and used it for a bin/compattest
+  that tests grok and all its dependencies.
+
 * Add grok.getApplication() that, similar to grok.getSite() retrieves
   the "nearest" enclosing grok.Application object.
 

Modified: grok/trunk/buildout.cfg
===================================================================
--- grok/trunk/buildout.cfg	2009-12-22 16:17:04 UTC (rev 106888)
+++ grok/trunk/buildout.cfg	2009-12-22 16:51:33 UTC (rev 106889)
@@ -6,6 +6,7 @@
     grokwiki
     mkdirs
     test
+    compattest
     test-grokcore
     zpasswd
     zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
@@ -43,13 +44,20 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = grok
+eggs = 
+    grok
+    grok[test]
 defaults = ['--tests-pattern', '^f?tests$', '-v']
 
+[compattest]
+recipe = z3c.recipe.compattest >= 0.12.1
+include-dependencies = grok
+
 [test-grokcore]
 recipe = zc.recipe.testrunner
 eggs =
     grok
+    grok[test]    
     martian
     grokcore.component
     grokcore.formlib

Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2009-12-22 16:17:04 UTC (rev 106888)
+++ grok/trunk/setup.py	2009-12-22 16:51:33 UTC (rev 106889)
@@ -13,6 +13,13 @@
     '********\n'
     )
 
+tests_require = [
+    'zope.app.testing',
+    'zope.configuration',
+    'zope.testbrowser',
+    'zope.testing',
+    ]
+
 setup(
     name='grok',
     version = '1.1a2dev',
@@ -77,11 +84,6 @@
                       'zope.site',
                       'zope.size',
                       'zope.traversing',
-                      # Test-only dependencies
-                      'zope.app.testing',
-                      'zope.configuration',
-                      'zope.testbrowser',
-                      'zope.testing',
                       # deprecated packages, there for backwards compatibility
                       'zope.app.error',
                       'zope.app.securitypolicy',
@@ -100,4 +102,6 @@
                       'zope.proxy',
                       'zope.viewlet',
                       ],
+    tests_require=tests_require,
+    extras_require={'test': tests_require},
 )

Modified: grok/trunk/versions.cfg
===================================================================
--- grok/trunk/versions.cfg	2009-12-22 16:17:04 UTC (rev 106888)
+++ grok/trunk/versions.cfg	2009-12-22 16:51:33 UTC (rev 106889)
@@ -25,10 +25,11 @@
 zc.catalog = 1.4.1
 zest.releaser = 2.10
 zope.app.session = 3.6.0
+z3c.recipe.compattest = 0.12.1
 
 # ZTK
 # http://svn.zope.org/*checkout*/zopetoolkit/trunk/ztk.cfg?rev=105860
-z3c.recipe.compattest = 0.8.0
+#z3c.recipe.compattest = 0.8.0
 zope.annotation = 3.5.0
 zope.app.apidoc = 3.6.7
 zope.app.applicationcontrol = 3.5.1