Integrate grokcore.resource into grok.

zopefoundation · May 14, 2012 · 53826ad · 53826ad
1 parent f798358
commit 53826ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -13,6 +13,10 @@ versions = versions
 extensions =
   buildout.dumppickedversions
   mr.developer
+auto-checkout = grokcore.resource
+
+[sources]
+grokcore.resource = svn svn+ssh://svn.zope.org/repos/main/grokcore.resource/trunk
 
 [versions]
 grok =

diff --git a/setup.py b/setup.py
@@ -51,6 +51,7 @@ def read(*rnames):
         'grokcore.layout >= 1.6',
         'grokcore.message',
         'grokcore.rest >= 1.3',
+        'grokcore.resource',
         'grokcore.security[role] >= 1.6',
         'grokcore.site >= 1.6.1',
         'grokcore.traverser >= 1.1',

diff --git a/src/grok/__init__.py b/src/grok/__init__.py
@@ -133,6 +133,8 @@
 from grokcore.rest import REST
 from grokcore.rest import restskin
 
+from grok.resource import resources
+
 # BBB These two functions are meant for test fixtures and should be
 # imported from grok.testing, not from grok.
 from grok.testing import grok, grok_component