[Checkins] SVN: groktoolkit/trunk/ use the ZTK trunk in preparation for the upcomming ZTK-1.1 release

[Jan-Wijbrand Kolman]

Log message for revision 119405:
  use the ZTK trunk in preparation for the upcomming ZTK-1.1 release

Changed:
  U   groktoolkit/trunk/buildout.cfg
  U   groktoolkit/trunk/grok.cfg

-=-
Modified: groktoolkit/trunk/buildout.cfg
===================================================================
--- groktoolkit/trunk/buildout.cfg	2011-01-05 22:55:19 UTC (rev 119404)
+++ groktoolkit/trunk/buildout.cfg	2011-01-06 10:21:45 UTC (rev 119405)
@@ -41,6 +41,11 @@
 [test-grok]
 recipe = z3c.recipe.compattest
 include = ${grok:packages}
+exclude =
+# compattest will pull in the dependencies for all the extras require
+# that are defined in zc.catalog, including a hoist of (deprecated)
+# zope.app.* dependencies.
+  zc.catalog
 eggs = zope.testrunner
 runner-defaults = ['--tests-pattern', '^f?tests$', '-v']
 

Modified: groktoolkit/trunk/grok.cfg
===================================================================
--- groktoolkit/trunk/grok.cfg	2011-01-05 22:55:19 UTC (rev 119404)
+++ groktoolkit/trunk/grok.cfg	2011-01-06 10:21:45 UTC (rev 119405)
@@ -1,7 +1,7 @@
 [buildout]
 extends =
-    http://download.zope.org/zopetoolkit/index/1.0.1/zopeapp-versions.cfg
-    http://download.zope.org/zopetoolkit/index/1.0.1/ztk-versions.cfg
+  http://svn.zope.org/repos/main/zopetoolkit/trunk/zopeapp-versions.cfg
+  http://svn.zope.org/repos/main/zopetoolkit/trunk/ztk-versions.cfg
 versions = versions
 
 [grok]
@@ -92,19 +92,6 @@
 z3c.testsetup = 0.6.1
 zc.recipe.filestorage = 1.0.1
 zest.releaser = 3.4
-# ZTK overrides
-mechanize = 0.2.3
-z3c.recipe.compattest = 0.13
-z3c.recipe.scripts = 1.0.1
-zc.buildout = 1.5.2
-zc.recipe.egg = 1.3.2
-zc.recipe.testrunner = 1.4.0
-zc.resourcelibrary = 1.3.2
-zope.app.appsetup = 3.15.0
-zope.app.wsgi = 3.10.0
-zope.testbrowser = 3.10.3
-zope.testing = 3.10.0
-zope.testrunner = 4.0.0
 
 [sources]
 fanstatic = hg ssh://hg@bitbucket.org/fanstatic/fanstatic