[Checkins] SVN: z3c.schema2xml/trunk/ * no more dependency on grok, just grokcore.component.

[Martijn Faassen]

Log message for revision 93665:
  * no more dependency on grok, just grokcore.component.
  * A more regular ftesting approach.
  

Changed:
  U   z3c.schema2xml/trunk/buildout.cfg
  U   z3c.schema2xml/trunk/setup.py
  U   z3c.schema2xml/trunk/src/z3c/schema2xml/_schema2xml.py
  U   z3c.schema2xml/trunk/src/z3c/schema2xml/configure.zcml
  A   z3c.schema2xml/trunk/src/z3c/schema2xml/ftesting.zcml
  A   z3c.schema2xml/trunk/src/z3c/schema2xml/testing.py
  U   z3c.schema2xml/trunk/src/z3c/schema2xml/tests.py

-=-
Modified: z3c.schema2xml/trunk/buildout.cfg
===================================================================
--- z3c.schema2xml/trunk/buildout.cfg	2008-12-05 18:15:48 UTC (rev 93664)
+++ z3c.schema2xml/trunk/buildout.cfg	2008-12-05 18:31:56 UTC (rev 93665)
@@ -1,12 +1,12 @@
 [buildout]
 develop = .
 parts = test devpython
-extends = http://grok.zope.org/releaseinfo/grok-0.11.cfg
+extends = http://grok.zope.org/releaseinfo/grok-0.14.cfg
 versions = versions
 
 [versions]
-martian = 0.9.2
 lxml = 1.3.6
+zope.testing=3.6.0
 
 [test]
 recipe = zc.recipe.testrunner

Modified: z3c.schema2xml/trunk/setup.py
===================================================================
--- z3c.schema2xml/trunk/setup.py	2008-12-05 18:15:48 UTC (rev 93664)
+++ z3c.schema2xml/trunk/setup.py	2008-12-05 18:31:56 UTC (rev 93665)
@@ -20,7 +20,7 @@
       install_requires=[
         'setuptools',
         'lxml',
-        'grok',
+        'grokcore.component',
         'zc.sourcefactory',
       ],
       entry_points="""

Modified: z3c.schema2xml/trunk/src/z3c/schema2xml/_schema2xml.py
===================================================================
--- z3c.schema2xml/trunk/src/z3c/schema2xml/_schema2xml.py	2008-12-05 18:15:48 UTC (rev 93664)
+++ z3c.schema2xml/trunk/src/z3c/schema2xml/_schema2xml.py	2008-12-05 18:31:56 UTC (rev 93665)
@@ -1,6 +1,6 @@
 from lxml import etree
 
-import grok
+import grokcore.component as grok
 
 from persistent import Persistent
 

Modified: z3c.schema2xml/trunk/src/z3c/schema2xml/configure.zcml
===================================================================
--- z3c.schema2xml/trunk/src/z3c/schema2xml/configure.zcml	2008-12-05 18:15:48 UTC (rev 93664)
+++ z3c.schema2xml/trunk/src/z3c/schema2xml/configure.zcml	2008-12-05 18:31:56 UTC (rev 93665)
@@ -1 +1,8 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure
+  xmlns="http://namespaces.zope.org/zope"
+  xmlns:grok="http://namespaces.zope.org/grok">
+
+  <include package="grokcore.component" file="meta.zcml" />
+
+  <grok:grok package="."/>
+</configure>

Added: z3c.schema2xml/trunk/src/z3c/schema2xml/ftesting.zcml
===================================================================
--- z3c.schema2xml/trunk/src/z3c/schema2xml/ftesting.zcml	                        (rev 0)
+++ z3c.schema2xml/trunk/src/z3c/schema2xml/ftesting.zcml	2008-12-05 18:31:56 UTC (rev 93665)
@@ -0,0 +1,6 @@
+<configure
+   xmlns="http://namespaces.zope.org/zope"
+   >
+  <include package="z3c.schema2xml" />
+
+</configure>

Added: z3c.schema2xml/trunk/src/z3c/schema2xml/testing.py
===================================================================
--- z3c.schema2xml/trunk/src/z3c/schema2xml/testing.py	                        (rev 0)
+++ z3c.schema2xml/trunk/src/z3c/schema2xml/testing.py	2008-12-05 18:31:56 UTC (rev 93665)
@@ -0,0 +1,7 @@
+import os
+import z3c.schema2xml
+from zope.app.testing.functional import ZCMLLayer
+
+ftesting_zcml = os.path.join(
+    os.path.dirname(z3c.schema2xml.__file__), 'ftesting.zcml')
+FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer')

Modified: z3c.schema2xml/trunk/src/z3c/schema2xml/tests.py
===================================================================
--- z3c.schema2xml/trunk/src/z3c/schema2xml/tests.py	2008-12-05 18:15:48 UTC (rev 93664)
+++ z3c.schema2xml/trunk/src/z3c/schema2xml/tests.py	2008-12-05 18:31:56 UTC (rev 93665)
@@ -1,23 +1,13 @@
 import unittest
 
-from zope.testing import doctest
+from zope.app.testing.functional import FunctionalDocFileSuite
+from z3c.schema2xml.testing import FunctionalLayer
 
-def grok_setup(iets):
-    import grok
-    grok.grok('z3c.schema2xml')
-
 def test_suite():
-    optionflags = (
-        doctest.ELLIPSIS
-        | doctest.REPORT_NDIFF
-        | doctest.NORMALIZE_WHITESPACE
-        )
 
-    return unittest.TestSuite([
-        doctest.DocFileSuite(
-            'README.txt', setUp=grok_setup, optionflags=optionflags)
-        ])
+    readme = FunctionalDocFileSuite(
+        'README.txt')
 
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
+    readme.layer = FunctionalLayer
 
+    return unittest.TestSuite([readme])