[Checkins] SVN: grokui.base/trunk/ Merge with '0.4.1-fanstatic' branch. Use testlayer in zope.fanstatic.
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Sun Jan 2 18:19:16 EST 2011
Log message for revision 119271:
Merge with '0.4.1-fanstatic' branch. Use testlayer in zope.fanstatic.
Changed:
_U grokui.base/trunk/
U grokui.base/trunk/CHANGES.txt
U grokui.base/trunk/buildout.cfg
U grokui.base/trunk/setup.py
U grokui.base/trunk/src/grokui/base/configure.zcml
U grokui.base/trunk/src/grokui/base/tests/test_layout.py
U grokui.base/trunk/src/grokui/base/tests/test_readme.py
-=-
Property changes on: grokui.base/trunk
___________________________________________________________________
Modified: svn:ignore
- develop-eggs
bin
parts
.installed.cfg
+ develop-eggs
bin
parts
.installed.cfg
.mr.developer.cfg
Modified: grokui.base/trunk/CHANGES.txt
===================================================================
--- grokui.base/trunk/CHANGES.txt 2011-01-02 22:56:04 UTC (rev 119270)
+++ grokui.base/trunk/CHANGES.txt 2011-01-02 23:19:16 UTC (rev 119271)
@@ -1,6 +1,11 @@
CHANGES
*******
+0.5 (unreleased)
+================
+
+- Use `fanstatic` instead of zope DirectoryResource.
+
0.4.2 (2010-12-16)
==================
Modified: grokui.base/trunk/buildout.cfg
===================================================================
--- grokui.base/trunk/buildout.cfg 2011-01-02 22:56:04 UTC (rev 119270)
+++ grokui.base/trunk/buildout.cfg 2011-01-02 23:19:16 UTC (rev 119271)
@@ -1,63 +1,20 @@
[buildout]
develop = .
-parts = test data zopectl app
-extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
-versions = versions
+parts = test
+extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
+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
+
[versions]
grokui.base =
+zope.app.wsgi = 3.10.0
-[data]
-recipe = zc.recipe.filestorage
-
-[app]
-recipe = zc.zope3recipes>=0.5.3:application
-eggs = grokui.base
-site.zcml =<configure xmlns='http://namespaces.zope.org/zope'
- xmlns:meta="http://namespaces.zope.org/meta"
- i18n_domain="zope"
- >
- <include package="grokui.base" />
- <include package="zope.app.twisted" />
-
- <unauthenticatedPrincipal id="zope.anybody"
- title="Unauthenticated User"
- />
- <unauthenticatedGroup id="zope.Anybody"
- title="Unauthenticated Users"
- />
- <authenticatedGroup id="zope.Authenticated"
- title="Authenticated Users"
- />
- <everybodyGroup id="zope.Everybody"
- title="All Users"
- />
- <principal id="zope.manager"
- title="Manager"
- login="grok"
- password_manager="Plain Text"
- password="grok"
- />
-
- <grant permission="zope.View"
- principal="zope.Anybody" />
-
- <grant permission="zope.app.dublincore.view"
- principal="zope.Anybody" />
-
- <role id="zope.Manager" title="Site Manager" />
- <role id="zope.Member" title="Site Member" />
- <grantAll role="zope.Manager" />
- <grant role="zope.Manager"
- principal="zope.manager" />
- </configure>
-
-# this section named so that the start/stop script is called bin/zopectl
-[zopectl]
-recipe = zc.zope3recipes:instance
-application = app
-zope.conf = ${data:zconfig}
-
[test]
recipe = zc.recipe.testrunner
eggs = grokui.base [test]
Modified: grokui.base/trunk/setup.py
===================================================================
--- grokui.base/trunk/setup.py 2011-01-02 22:56:04 UTC (rev 119270)
+++ grokui.base/trunk/setup.py 2011-01-02 23:19:16 UTC (rev 119271)
@@ -7,7 +7,7 @@
'zope.app.appsetup',
'zope.app.pagetemplate',
'zope.app.publication',
- 'zope.app.wsgi',
+ 'zope.app.wsgi > 3.10.0',
'zope.browserpage',
'zope.browserresource',
'zope.container',
@@ -54,6 +54,7 @@
zip_safe=False,
namespace_packages = ['grokui'],
install_requires=[
+ 'fanstatic',
'grokcore.component',
'grokcore.message',
'grokcore.view',
@@ -64,6 +65,7 @@
'zope.authentication',
'zope.browsermenu',
'zope.component',
+ 'zope.fanstatic',
'zope.interface',
'zope.location',
'zope.publisher',
@@ -72,7 +74,7 @@
],
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/trunk/src/grokui/base/configure.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/configure.zcml 2011-01-02 22:56:04 UTC (rev 119270)
+++ grokui.base/trunk/src/grokui/base/configure.zcml 2011-01-02 23:19:16 UTC (rev 119271)
@@ -4,6 +4,7 @@
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" />
Modified: grokui.base/trunk/src/grokui/base/tests/test_layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/test_layout.py 2011-01-02 22:56:04 UTC (rev 119270)
+++ grokui.base/trunk/src/grokui/base/tests/test_layout.py 2011-01-02 23:19:16 UTC (rev 119271)
@@ -52,7 +52,7 @@
import doctest
import grokcore.component as grok
from grokui.base import GrokUIView
-from zope.app.wsgi.testlayer import BrowserLayer
+from zope.fanstatic.testing import ZopeFanstaticBrowserLayer
class CaveAdminView(GrokUIView):
@@ -72,6 +72,6 @@
suite = unittest.TestSuite()
test = doctest.DocTestSuite(
optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
- test.layer = BrowserLayer(grokui.base)
+ test.layer = ZopeFanstaticBrowserLayer(grokui.base)
suite.addTest(test)
return suite
Modified: grokui.base/trunk/src/grokui/base/tests/test_readme.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/test_readme.py 2011-01-02 22:56:04 UTC (rev 119270)
+++ grokui.base/trunk/src/grokui/base/tests/test_readme.py 2011-01-02 23:19:16 UTC (rev 119271)
@@ -2,16 +2,15 @@
import unittest, doctest
import grokui.base
-from zope.app.wsgi.testlayer import BrowserLayer
+from zope.fanstatic.testing import ZopeFanstaticBrowserLayer
-
def test_suite():
suite = unittest.TestSuite()
readme = doctest.DocFileSuite(
'../README.txt',
optionflags=(doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE|
doctest.REPORT_NDIFF))
- readme.layer = BrowserLayer(grokui.base)
+ readme.layer = ZopeFanstaticBrowserLayer(grokui.base)
suite.addTest(readme)
return suite
More information about the checkins
mailing list