[Checkins] SVN: grokui.admin/trunk/ remove the fanstatic "dependency" and auto-checkouts as they are not really needed here at this point. do depend on the 1.5 (or greater) release of grokcore.site

[Jan-Wijbrand Kolman]

Log message for revision 119382:
  remove the fanstatic "dependency" and auto-checkouts as they are not really needed here at this point. do depend on the 1.5 (or greater) release of grokcore.site

Changed:
  U   grokui.admin/trunk/buildout.cfg
  U   grokui.admin/trunk/setup.py
  U   grokui.admin/trunk/src/grokui/admin/tests/tests.py

-=-
Modified: grokui.admin/trunk/buildout.cfg
===================================================================
--- grokui.admin/trunk/buildout.cfg	2011-01-05 11:20:44 UTC (rev 119381)
+++ grokui.admin/trunk/buildout.cfg	2011-01-05 11:49:37 UTC (rev 119382)
@@ -3,18 +3,9 @@
 parts = test
 extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
 extensions = mr.developer
-always-checkout = true
-auto-checkout = grok
-                zope.fanstatic
-                fanstatic
 
 [versions]
 grokui.admin =
-# Remove these after the next groktoolkit release.
-grokcore.xmlrpc = 1.0
-grokcore.traverser = 1.0
-grokcore.site = 1.5
-grokcore.rest = 1.0
 
 [test]
 recipe = zc.recipe.testrunner

Modified: grokui.admin/trunk/setup.py
===================================================================
--- grokui.admin/trunk/setup.py	2011-01-05 11:20:44 UTC (rev 119381)
+++ grokui.admin/trunk/setup.py	2011-01-05 11:49:37 UTC (rev 119382)
@@ -3,7 +3,6 @@
 
 tests_require = [
     'zope.app.wsgi',
-    'zope.fanstatic[test]',
     'zope.principalregistry',
     'zope.security',
     'zope.securitypolicy',
@@ -46,7 +45,7 @@
       install_requires=[
           'ZODB3',
           'grok',
-          'grokcore.site >= 1.5dev',
+          'grokcore.site >= 1.5',
           'grokui.base',
           'megrok.layout >= 1.0.1',
           'setuptools',

Modified: grokui.admin/trunk/src/grokui/admin/tests/tests.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/tests/tests.py	2011-01-05 11:20:44 UTC (rev 119381)
+++ grokui.admin/trunk/src/grokui/admin/tests/tests.py	2011-01-05 11:49:37 UTC (rev 119382)
@@ -5,7 +5,7 @@
 
 import zc.buildout.testing
 from zope.testing import renormalizing
-from zope.fanstatic.testing import ZopeFanstaticBrowserLayer
+from zope.app.wsgi.testlayer import BrowserLayer
 
 checker = renormalizing.RENormalizing([
     # Accommodate to exception wrapping in newer versions of mechanize
@@ -14,7 +14,7 @@
 
 def test_suite():
     suite = unittest.TestSuite()
-    functional_layer = ZopeFanstaticBrowserLayer(grokui.admin.tests)
+    functional_layer = BrowserLayer(grokui.admin.tests)
     optionflags=(doctest.ELLIPSIS +
                  doctest.NORMALIZE_WHITESPACE +
                  doctest.REPORT_NDIFF)