[Checkins] SVN: grokui.base/branches/0.4.1-fanstatic/ Depend on feature branches of fanstatic, zope.fanstatic and grokcore.view. We changed the registration to be a one.
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Mon Dec 6 06:19:03 EST 2010
Log message for revision 118714:
Depend on feature branches of fanstatic, zope.fanstatic and grokcore.view. We changed the registration to be a one.
Changed:
_U grokui.base/branches/0.4.1-fanstatic/
U grokui.base/branches/0.4.1-fanstatic/buildout.cfg
U grokui.base/branches/0.4.1-fanstatic/setup.py
U grokui.base/branches/0.4.1-fanstatic/src/grokui/base/configure.zcml
A grokui.base/branches/0.4.1-fanstatic/src/grokui/base/resource.py
U grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_layout.py
U grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_readme.py
-=-
Property changes on: grokui.base/branches/0.4.1-fanstatic
___________________________________________________________________
Modified: svn:ignore
- develop-eggs
bin
parts
.installed.cfg
+ develop-eggs
bin
parts
.installed.cfg
.mr.developer.cfg
Modified: grokui.base/branches/0.4.1-fanstatic/buildout.cfg
===================================================================
--- grokui.base/branches/0.4.1-fanstatic/buildout.cfg 2010-12-06 10:57:43 UTC (rev 118713)
+++ grokui.base/branches/0.4.1-fanstatic/buildout.cfg 2010-12-06 11:19:02 UTC (rev 118714)
@@ -3,7 +3,16 @@
parts = test data zopectl app
extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
versions = versions
+extensions = mr.developer
+auto-checkout = fanstatic
+ zope.fanstatic
+ grokcore.view
+[sources]
+fanstatic = hg http://bitbucket.org/fanstatic/fanstatic
+zope.fanstatic = svn http://svn.zope.org/repos/main/zope.fanstatic/trunk
+grokcore.view = svn http://svn.zope.org/repos/main/grokcore.view/branches/1.13.5-without-static
+
[versions]
grokui.base =
Modified: grokui.base/branches/0.4.1-fanstatic/setup.py
===================================================================
--- grokui.base/branches/0.4.1-fanstatic/setup.py 2010-12-06 10:57:43 UTC (rev 118713)
+++ grokui.base/branches/0.4.1-fanstatic/setup.py 2010-12-06 11:19:02 UTC (rev 118714)
@@ -53,6 +53,7 @@
zip_safe=False,
namespace_packages = ['grokui'],
install_requires=[
+ 'fanstatic',
'grokcore.component',
'grokcore.message',
'grokcore.view',
@@ -63,6 +64,7 @@
'zope.authentication',
'zope.browsermenu',
'zope.component',
+ 'zope.fanstatic',
'zope.interface',
'zope.location',
'zope.publisher',
@@ -71,7 +73,8 @@
],
tests_require = tests_require,
extras_require = dict(test=tests_require),
- entry_points="""
- # Add entry points here
- """,
- )
+ entry_points={
+ 'fanstatic.libraries': [
+ 'grokui.base = grokui.base.resource:library',
+ ]
+ })
Modified: grokui.base/branches/0.4.1-fanstatic/src/grokui/base/configure.zcml
===================================================================
--- grokui.base/branches/0.4.1-fanstatic/src/grokui/base/configure.zcml 2010-12-06 10:57:43 UTC (rev 118713)
+++ grokui.base/branches/0.4.1-fanstatic/src/grokui/base/configure.zcml 2010-12-06 11:19:02 UTC (rev 118714)
@@ -4,6 +4,8 @@
xmlns:browser="http://namespaces.zope.org/browser"
>
<include package="zope.security" file="meta.zcml" />
+ <include package="zope.fanstatic" />
+
<include package="grokcore.component" file="meta.zcml" />
<include package="grokcore.viewlet" file="meta.zcml" />
Added: grokui.base/branches/0.4.1-fanstatic/src/grokui/base/resource.py
===================================================================
--- grokui.base/branches/0.4.1-fanstatic/src/grokui/base/resource.py (rev 0)
+++ grokui.base/branches/0.4.1-fanstatic/src/grokui/base/resource.py 2010-12-06 11:19:02 UTC (rev 118714)
@@ -0,0 +1,3 @@
+from fanstatic import Library
+
+library = Library('grokui.base', 'static')
Modified: grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_layout.py
===================================================================
--- grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_layout.py 2010-12-06 10:57:43 UTC (rev 118713)
+++ grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_layout.py 2010-12-06 11:19:02 UTC (rev 118714)
@@ -52,9 +52,9 @@
import doctest
import grokcore.component as grok
from grokui.base import GrokUIView
+import fanstatic
from zope.app.wsgi.testlayer import BrowserLayer
-
class CaveAdminView(GrokUIView):
"""An admin page to administer caves.
"""
@@ -68,10 +68,16 @@
return u'Hello from CaveAdminView'
+# XXX fix after resolving https://bitbucket.org/fanstatic/fanstatic/issue/29
+
+def setUp(test):
+ fanstatic.init_current_needed_inclusions()
+
def test_suite():
suite = unittest.TestSuite()
test = doctest.DocTestSuite(
- optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
+ optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE,
+ setUp=setUp)
test.layer = BrowserLayer(grokui.base)
suite.addTest(test)
return suite
Modified: grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_readme.py
===================================================================
--- grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_readme.py 2010-12-06 10:57:43 UTC (rev 118713)
+++ grokui.base/branches/0.4.1-fanstatic/src/grokui/base/tests/test_readme.py 2010-12-06 11:19:02 UTC (rev 118714)
@@ -3,14 +3,20 @@
import unittest, doctest
import grokui.base
from zope.app.wsgi.testlayer import BrowserLayer
+import fanstatic
+# XXX fix after resolving https://bitbucket.org/fanstatic/fanstatic/issue/29
+def setUp(test):
+ fanstatic.init_current_needed_inclusions()
+
def test_suite():
suite = unittest.TestSuite()
readme = doctest.DocFileSuite(
'../README.txt',
optionflags=(doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE|
- doctest.REPORT_NDIFF))
+ doctest.REPORT_NDIFF),
+ setUp=setUp)
readme.layer = BrowserLayer(grokui.base)
suite.addTest(readme)
return suite
More information about the checkins
mailing list