[Checkins] SVN: grokapps/Adder/ Upgrade Adder application to Grok 0.14
Kevin Teague
kevin at bud.ca
Fri Oct 24 03:46:31 EDT 2008
Log message for revision 92522:
Upgrade Adder application to Grok 0.14
Changed:
_U grokapps/Adder/
U grokapps/Adder/buildout.cfg
U grokapps/Adder/setup.py
_U grokapps/Adder/src/
_U grokapps/Adder/src/adder/
U grokapps/Adder/src/adder/configure.zcml
A grokapps/Adder/src/adder/ftesting.zcml
D grokapps/Adder/src/adder/ftests/__init__.py
D grokapps/Adder/src/adder/ftests/index_view.py
A grokapps/Adder/src/adder/ftests/index_view.txt
D grokapps/Adder/src/adder/ftests/test_adder_functional.py
D grokapps/Adder/src/adder/tests/
A grokapps/Adder/src/adder/tests.py
A grokapps/Adder/versions.cfg
-=-
Property changes on: grokapps/Adder
___________________________________________________________________
Name: svn:ignore
+ parts
eggs
bin
develop-eggs
.installed.cfg
Modified: grokapps/Adder/buildout.cfg
===================================================================
--- grokapps/Adder/buildout.cfg 2008-10-24 05:44:37 UTC (rev 92521)
+++ grokapps/Adder/buildout.cfg 2008-10-24 07:46:30 UTC (rev 92522)
@@ -1,14 +1,14 @@
[buildout]
develop = .
-parts = app data zopectl test
-find-links = http://download.zope.org/distribution/
+parts = eggbasket app data zopectl i18n test
newest = false
-extends = http://grok.zope.org/releaseinfo/grok-0.11.cfg
+extends = versions.cfg
+# eggs will be installed in the default buildout location
+# (see .buildout/default.cfg in your home directory)
+# unless you specify an eggs-directory option here.
+
versions = versions
-[data]
-recipe = zc.recipe.filestorage
-
[app]
recipe = zc.zope3recipes>=0.5.3:application
eggs = Adder
@@ -31,7 +31,7 @@
password="grok"
/>
- <!-- Replace the following directive if you don't want
+ <!-- Replace the following directive if you do not want
public access -->
<grant permission="zope.View"
principal="zope.Anybody" />
@@ -58,3 +58,17 @@
recipe = zc.recipe.testrunner
eggs = Adder
defaults = ['--tests-pattern', '^f?tests$', '-v']
+
+# this section named so that the i18n scripts are called bin/i18n...
+[i18n]
+recipe = z3c.recipe.i18n:i18n
+packages = Adder
+eggs = Adder
+domain = Adder
+output = src/Adder/locales
+zcml =
+
+[eggbasket]
+recipe = z3c.recipe.eggbasket
+eggs = grok
+url = http://grok.zope.org/releaseinfo/grok-eggs-0.14.tgz
Modified: grokapps/Adder/setup.py
===================================================================
--- grokapps/Adder/setup.py 2008-10-24 05:44:37 UTC (rev 92521)
+++ grokapps/Adder/setup.py 2008-10-24 07:46:30 UTC (rev 92522)
@@ -5,9 +5,7 @@
setup(name='Adder',
version=version,
description="",
- long_description="""\
-""",
- # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+ long_description="",
classifiers=[],
keywords="",
author="",
@@ -20,9 +18,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # Add extra requirements here
+ 'grokui.admin',
+ 'z3c.testsetup',
+ 'zope.app.file',
],
- entry_points="""
- # Add entry points here
- """,
- )
+ entry_points="",
+)
Property changes on: grokapps/Adder/src
___________________________________________________________________
Name: svn:ignore
+ Adder.egg-info
Property changes on: grokapps/Adder/src/adder
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Modified: grokapps/Adder/src/adder/configure.zcml
===================================================================
--- grokapps/Adder/src/adder/configure.zcml 2008-10-24 05:44:37 UTC (rev 92521)
+++ grokapps/Adder/src/adder/configure.zcml 2008-10-24 07:46:30 UTC (rev 92522)
@@ -1,5 +1,6 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok">
<include package="grok" />
+ <includeDependencies package="." />
<grok:grok package="." />
</configure>
Added: grokapps/Adder/src/adder/ftesting.zcml
===================================================================
--- grokapps/Adder/src/adder/ftesting.zcml (rev 0)
+++ grokapps/Adder/src/adder/ftesting.zcml 2008-10-24 07:46:30 UTC (rev 92522)
@@ -0,0 +1,34 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ i18n_domain="adder"
+ package="adder"
+ >
+
+ <include package="adder" />
+
+ <!-- Typical functional testing security setup -->
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+ />
+
+ <unauthenticatedPrincipal
+ id="zope.anybody"
+ title="Unauthenticated User"
+ />
+ <grant
+ permission="zope.View"
+ principal="zope.anybody"
+ />
+
+ <principal
+ id="zope.mgr"
+ title="Manager"
+ login="mgr"
+ password="mgrpw"
+ />
+
+ <role id="zope.Manager" title="Site Manager" />
+ <grantAll role="zope.Manager" />
+ <grant role="zope.Manager" principal="zope.mgr" />
+
+</configure>
Deleted: grokapps/Adder/src/adder/ftests/__init__.py
===================================================================
Deleted: grokapps/Adder/src/adder/ftests/index_view.py
===================================================================
--- grokapps/Adder/src/adder/ftests/index_view.py 2008-10-24 05:44:37 UTC (rev 92521)
+++ grokapps/Adder/src/adder/ftests/index_view.py 2008-10-24 07:46:30 UTC (rev 92522)
@@ -1,52 +0,0 @@
-"""
-The Index view of the Adder app has a form for entering items to be added
-
- >>> from adder.app import Adder
- >>> getRootFolder()['adder'] = adder = Adder()
-
- >>> from zope.testbrowser.testing import Browser
- >>> browser = Browser()
- >>> browser.open('http://localhost/adder')
-
-Since we've just started the Adder, there shouldn't be a "Clear" button
-
- >>> browser.getControl('bt_clear')
- Traceback (innermost last):
- ...
- LookupError: name 'bt_clear'
-
-There should be an entry field for the number to be added
-and a "+" button.
-
- >>> browser.getControl('term').value = '1.234'
- >>> browser.getControl('bt_add').value
- '+'
- >>> browser.getControl('bt_add').click()
-
-We should find the '1.234' value twice: one in the total, one in the "tape"
-
- >>> browser.contents.count('1.234')
- 2
-
-We can add another number:
-
- >>> browser.getControl('term').value = '2'
- >>> browser.getControl('bt_add').click()
-
-And see the total and the "tape" numbers:
-
- >>> '3.234' in browser.contents
- True
- >>> '1.234' in browser.contents
- True
- >>> '2.0' in browser.contents
- True
-
-Also, now that we have some numbers in the "tape", there should be a "Clear"
-button, which clears the tape and the total:
-
- >>> browser.getControl('bt_clear').click()
- >>> '3.234' in browser.contents
- False
-
-"""
Copied: grokapps/Adder/src/adder/ftests/index_view.txt (from rev 92521, grokapps/Adder/src/adder/ftests/index_view.py)
===================================================================
--- grokapps/Adder/src/adder/ftests/index_view.txt (rev 0)
+++ grokapps/Adder/src/adder/ftests/index_view.txt 2008-10-24 07:46:30 UTC (rev 92522)
@@ -0,0 +1,53 @@
+:Test-Layer: functional
+
+The Index view of the Adder app has a form for entering items to be added
+
+ >>> from adder.app import Adder
+ >>> getRootFolder()['adder'] = adder = Adder()
+
+ >>> from zope.testbrowser.testing import Browser
+ >>> browser = Browser()
+ >>> browser.open('http://localhost/adder')
+
+Since we've just started the Adder, there shouldn't be a "Clear" button
+
+ >>> browser.getControl('bt_clear')
+ Traceback (innermost last):
+ ...
+ LookupError: label 'bt_clear'
+
+There should be an entry field for the number to be added
+and a "+" button.
+
+ >>> browser.getControl(name='term').value = '1.234'
+ >>> add_button = browser.getControl(name='bt_add')
+ >>> add_button.value
+ '+'
+ >>> add_button.click()
+
+We should find the '1.234' value twice: one in the total, one in the "tape"
+
+ >>> browser.contents.count('1.234')
+ 2
+
+We can add another number:
+
+ >>> browser.getControl(name='term').value = '2'
+ >>> browser.getControl(name='bt_add').click()
+
+And see the total and the "tape" numbers:
+
+ >>> '3.234' in browser.contents
+ True
+ >>> '1.234' in browser.contents
+ True
+ >>> '2.0' in browser.contents
+ True
+
+Also, now that we have some numbers in the "tape", there should be a "Clear"
+button, which clears the tape and the total:
+
+ >>> browser.getControl(name='bt_clear').click()
+ >>> '3.234' in browser.contents
+ False
+
Deleted: grokapps/Adder/src/adder/ftests/test_adder_functional.py
===================================================================
--- grokapps/Adder/src/adder/ftests/test_adder_functional.py 2008-10-24 05:44:37 UTC (rev 92521)
+++ grokapps/Adder/src/adder/ftests/test_adder_functional.py 2008-10-24 07:46:30 UTC (rev 92522)
@@ -1,51 +0,0 @@
-import unittest
-from pkg_resources import resource_listdir
-from zope.testing import doctest
-from zope.app.testing.functional import (HTTPCaller, getRootFolder,
- FunctionalTestSetup, sync, Functional)
-
-# XXX bastardized from zope.app.testing.functional.FunctionalDocFileSuite :-(
-def FunctionalDocTestSuite(*paths, **kw):
- globs = kw.setdefault('globs', {})
- globs['http'] = HTTPCaller()
- globs['getRootFolder'] = getRootFolder
- globs['sync'] = sync
-
- #kw['package'] = doctest._normalize_module(kw.get('package'))
-
- kwsetUp = kw.get('setUp')
- def setUp(test):
- FunctionalTestSetup().setUp()
-
- if kwsetUp is not None:
- kwsetUp(test)
- kw['setUp'] = setUp
-
- kwtearDown = kw.get('tearDown')
- def tearDown(test):
- if kwtearDown is not None:
- kwtearDown(test)
- FunctionalTestSetup().tearDown()
- kw['tearDown'] = tearDown
-
- if 'optionflags' not in kw:
- old = doctest.set_unittest_reportflags(0)
- doctest.set_unittest_reportflags(old)
- kw['optionflags'] = (old
- | doctest.ELLIPSIS
- | doctest.REPORT_NDIFF
- | doctest.NORMALIZE_WHITESPACE)
-
- suite = doctest.DocTestSuite(*paths, **kw)
- suite.layer = Functional
- return suite
-
-def test_suite():
- suite = unittest.TestSuite()
- from adder.ftests import index_view
- test = FunctionalDocTestSuite(index_view)
- suite.addTest(test)
- return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Added: grokapps/Adder/src/adder/tests.py
===================================================================
--- grokapps/Adder/src/adder/tests.py (rev 0)
+++ grokapps/Adder/src/adder/tests.py 2008-10-24 07:46:30 UTC (rev 92522)
@@ -0,0 +1,12 @@
+import os.path
+import z3c.testsetup
+import adder
+from zope.app.testing.functional import ZCMLLayer
+
+
+ftesting_zcml = os.path.join(
+ os.path.dirname(adder.__file__), 'ftesting.zcml')
+FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
+ allow_teardown=True)
+
+test_suite = z3c.testsetup.register_all_tests('adder')
Added: grokapps/Adder/versions.cfg
===================================================================
--- grokapps/Adder/versions.cfg (rev 0)
+++ grokapps/Adder/versions.cfg 2008-10-24 07:46:30 UTC (rev 92522)
@@ -0,0 +1,128 @@
+# This file contains a list of versions of the various grok modules that
+# belong together.
+# It was downloaded from http://grok.zope.org/releaseinfo/grok-0.14.cfg
+# when this project was created.
+
+[versions]
+grok = 0.14
+ClientForm = 0.2.9
+Pygments = 0.8.1
+RestrictedPython = 3.4.2
+ZConfig = 2.5.1
+ZODB3 = 3.8
+docutils = 0.4
+grokcore.component = 1.5.1
+grokcore.formlib = 1.0
+grokcore.security = 1.0
+grokcore.view = 1.1
+grokui.admin = 0.1.2
+martian = 0.11
+mechanize = 0.1.7b
+pytz = 2007k
+simplejson = 1.7.1
+z3c.autoinclude = 0.2.2
+z3c.flashmessage = 1.0
+z3c.testsetup = 0.2.1
+zc.catalog = 1.2
+zc.recipe.testrunner = 1.0.0
+zdaemon = 2.0.2
+zodbcode = 3.4
+zope.annotation = 3.4.1
+zope.app.apidoc = 3.4.3
+zope.app.applicationcontrol = 3.4.3
+zope.app.appsetup = 3.4.1
+zope.app.authentication = 3.4.3
+zope.app.basicskin = 3.4
+zope.app.broken = 3.4
+zope.app.catalog = 3.5.1
+zope.app.component = 3.4.1
+zope.app.container = 3.5.6
+zope.app.content = 3.4
+zope.app.debug = 3.4.1
+zope.app.dependable = 3.4
+zope.app.error = 3.5.1
+zope.app.exception = 3.4.1
+zope.app.file = 3.4.4
+zope.app.folder = 3.4
+zope.app.form = 3.4.1
+zope.app.generations = 3.4.1
+zope.app.http = 3.4.1
+zope.app.i18n = 3.4.4
+zope.app.interface = 3.4
+zope.app.intid = 3.4.1
+zope.app.keyreference = 3.4.1
+zope.app.locales = 3.4.5
+zope.app.onlinehelp = 3.4.1
+zope.app.pagetemplate = 3.4.1
+zope.app.preference = 3.4.1
+zope.app.principalannotation = 3.4
+zope.app.publication = 3.4.3
+zope.app.publisher = 3.4.1
+zope.app.renderer = 3.4
+zope.app.rotterdam = 3.4.1
+zope.app.schema = 3.4
+zope.app.security = 3.5.2
+zope.app.securitypolicy = 3.4.6
+zope.app.server = 3.4.2
+zope.app.session = 3.5.1
+zope.app.skins = 3.4
+zope.app.testing = 3.4.3
+zope.app.tree = 3.4
+zope.app.twisted = 3.4.1
+zope.app.wsgi = 3.4.1
+zope.app.zapi = 3.4
+zope.app.zcmlfiles = 3.4.3
+zope.app.zopeappgenerations = 3.4
+zope.cachedescriptors = 3.4.1
+zope.component = 3.4
+zope.configuration = 3.4
+zope.contentprovider = 3.4
+zope.contenttype = 3.4
+zope.copypastemove = 3.4
+zope.datetime = 3.4
+zope.deferredimport = 3.4
+zope.deprecation = 3.4
+zope.dottedname = 3.4.2
+zope.dublincore = 3.4
+zope.error = 3.5.1
+zope.event = 3.4
+zope.exceptions = 3.4
+zope.filerepresentation = 3.4
+zope.formlib = 3.4
+zope.hookable = 3.4
+zope.i18n = 3.4
+zope.i18nmessageid = 3.4.3
+zope.index = 3.4.1
+zope.interface = 3.4.1
+zope.lifecycleevent = 3.4
+zope.location = 3.4
+zope.minmax = 1.1
+zope.modulealias = 3.4
+zope.pagetemplate = 3.4
+zope.proxy = 3.4.2
+zope.publisher = 3.4.6
+zope.schema = 3.4
+zope.security = 3.4.1
+zope.securitypolicy = 3.4.1
+zope.server = 3.4.3
+zope.session = 3.4.1
+zope.size = 3.4
+zope.structuredtext = 3.4
+zope.tal = 3.4.1
+zope.tales = 3.4
+zope.testbrowser = 3.4.2
+zope.testing = 3.5.4
+zope.thread = 3.4
+zope.traversing = 3.4.1
+zope.viewlet = 3.4.2
+
+
+# Here we pin the recipes used in the buildout.cfg
+z3c.recipe.i18n = 0.5.0
+z3c.recipe.eggbasket = 0.4.0
+zc.buildout = 1.0.6
+zc.recipe.egg = 1.1.0b1
+zc.recipe.filestorage = 1.0.1
+zc.recipe.testrunner = 1.0.0
+zc.zodbrecipes = 0.4.0
+zc.zope3recipes = 0.7.0
More information about the Checkins
mailing list