[Checkins] SVN: zam.api/trunk/ Updating tests and dependencies to work with latest versions of
Stephan Richter
srichter at gmail.com
Mon Jul 6 14:41:37 EDT 2009
Log message for revision 101662:
Updating tests and dependencies to work with latest versions of
packages.
Getting ready for release.
Changed:
U zam.api/trunk/CHANGES.txt
U zam.api/trunk/buildout.cfg
U zam.api/trunk/setup.py
U zam.api/trunk/src/zam/api/app.zcml
U zam.api/trunk/src/zam/api/browser/README.txt
U zam.api/trunk/src/zam/api/ftesting.zcml
U zam.api/trunk/src/zam/api/testing.py
-=-
Modified: zam.api/trunk/CHANGES.txt
===================================================================
--- zam.api/trunk/CHANGES.txt 2009-07-06 18:40:32 UTC (rev 101661)
+++ zam.api/trunk/CHANGES.txt 2009-07-06 18:41:36 UTC (rev 101662)
@@ -3,10 +3,10 @@
=======
-Version 0.5.4dev (unreleased)
------------------------------
+Version 0.6.0 (2009-07-06)
+--------------------------
-- ...
+- Updating tests and dependencies to work with latest versions of packages.
Version 0.5.3 (2008-06-07)
-----------------------------
Modified: zam.api/trunk/buildout.cfg
===================================================================
--- zam.api/trunk/buildout.cfg 2009-07-06 18:40:32 UTC (rev 101661)
+++ zam.api/trunk/buildout.cfg 2009-07-06 18:41:36 UTC (rev 101662)
@@ -5,7 +5,7 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zam.api [test]
+eggs = zam.api [app,test]
[checker]
@@ -15,7 +15,7 @@
[coverage-test]
recipe = zc.recipe.testrunner
-eggs = zam.api [test]
+eggs = zam.api [app,test]
defaults = ['--coverage', '../../coverage']
Modified: zam.api/trunk/setup.py
===================================================================
--- zam.api/trunk/setup.py 2009-07-06 18:40:32 UTC (rev 101661)
+++ zam.api/trunk/setup.py 2009-07-06 18:41:36 UTC (rev 101662)
@@ -23,7 +23,7 @@
setup (
name='zam.api',
- version='0.5.4dev',
+ version='0.6.0',
author = "Stephan Richter, Roger Ineichen and the Zope Community",
author_email = "zope3-dev at zope.org",
description = "API for ZAM (Zope Application Management",
@@ -50,17 +50,30 @@
package_dir = {'':'src'},
namespace_packages = ['zam'],
extras_require = dict(
- test = [
+ app = [
'z3c.baseregistry',
'z3c.zrtresource',
'zope.annotation',
+ 'zope.app.broken',
'zope.app.component',
+ 'zope.app.error',
+ 'zope.app.keyreference',
+ 'zope.app.i18n',
'zope.app.intid',
+ 'zope.app.principalannotation',
+ 'zope.app.schema',
'zope.app.securitypolicy',
'zope.app.server',
'zope.app.testing',
'zope.app.twisted',
'zope.app.session',
+ 'zope.app.zopeappgenerations',
+ 'zope.site',
+ ],
+ test = [
+ 'z3c.pt',
+ 'z3c.ptcompat',
+ 'zope.site',
'zope.testbrowser',
'zope.testing',
],
Modified: zam.api/trunk/src/zam/api/app.zcml
===================================================================
--- zam.api/trunk/src/zam/api/app.zcml 2009-07-06 18:40:32 UTC (rev 101661)
+++ zam.api/trunk/src/zam/api/app.zcml 2009-07-06 18:41:36 UTC (rev 101662)
@@ -24,7 +24,6 @@
<exclude package="zope.app.broken" file="browser.zcml" />
<exclude package="zope.app.container.browser" />
<exclude package="zope.app.error.browser" />
- <exclude package="zope.app.folder.browser" />
<exclude package="zope.app.i18n.browser" />
<exclude package="zope.app.intid.browser" />
<exclude package="zope.app.securitypolicy.browser" />
@@ -33,13 +32,12 @@
<!-- meta configure -->
- <include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.component.browser" file="meta.zcml" />
<include package="zope.app.container.browser" file="meta.zcml" />
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zope.app.publication" file="meta.zcml" />
<include package="zope.app.publisher" file="meta.zcml" />
<include package="zope.app.security" file="meta.zcml" />
+ <include package="zope.component" file="meta.zcml" />
<include package="zope.i18n" file="meta.zcml" />
<include package="zope.security" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
@@ -72,6 +70,7 @@
<!-- zope packages -->
<include package="zope.annotation" />
<include package="zope.component" />
+ <include package="zope.container" />
<include package="zope.contentprovider" />
<include package="zope.dublincore" />
<include package="zope.error" />
@@ -79,6 +78,7 @@
<include package="zope.publisher" />
<include package="zope.securitypolicy" />
<include package="zope.session" />
+ <include package="zope.site" />
<include package="zope.traversing" />
<include package="zope.traversing.browser" />
@@ -88,7 +88,6 @@
<include package="zope.app.broken" />
<include package="zope.app.component" />
<include package="zope.app.container" />
- <include package="zope.app.folder" />
<include package="zope.app.http" />
<include package="zope.app.intid" />
<include package="zope.app.keyreference" />
@@ -137,4 +136,4 @@
/>
</class>
-</configure>
\ No newline at end of file
+</configure>
Modified: zam.api/trunk/src/zam/api/browser/README.txt
===================================================================
--- zam.api/trunk/src/zam/api/browser/README.txt 2009-07-06 18:40:32 UTC (rev 101661)
+++ zam.api/trunk/src/zam/api/browser/README.txt 2009-07-06 18:41:36 UTC (rev 101662)
@@ -80,9 +80,10 @@
</div>
<div>
<div class="buttons">
- <input type="submit" id="zam-api-testing-buttons-install"
- name="zam.api.testing.buttons.install"
- class="submit-widget button-field" value="Install" />
+ <input id="zam-api-testing-buttons-install"
+ name="zam.api.testing.buttons.install"
+ class="submit-widget button-field" value="Install"
+ type="submit" />
</div>
</div>
</fieldset>
@@ -123,9 +124,10 @@
...
<div>
<div class="buttons">
- <input type="submit" id="zam-api-testing-buttons-uninstall"
- name="zam.api.testing.buttons.uninstall"
- class="submit-widget button-field" value="Uninstall" />
+ <input id="zam-api-testing-buttons-uninstall"
+ name="zam.api.testing.buttons.uninstall"
+ class="submit-widget button-field" value="Uninstall"
+ type="submit" />
</div>
</div>
...
Modified: zam.api/trunk/src/zam/api/ftesting.zcml
===================================================================
--- zam.api/trunk/src/zam/api/ftesting.zcml 2009-07-06 18:40:32 UTC (rev 101661)
+++ zam.api/trunk/src/zam/api/ftesting.zcml 2009-07-06 18:41:36 UTC (rev 101662)
@@ -27,13 +27,22 @@
/>
<require
permission="zope.Public"
- attributes="title"
+ attributes="title testAttr"
interface="zope.app.container.interfaces.IContained"
/>
<require
permission="zope.ManageSite"
+ set_attributes="testAttr"
set_schema=".testing.IZAMTestSite"
/>
+ <require
+ permission="zope.Public"
+ interface="zope.container.interfaces.IReadContainer"
+ />
+ <require
+ permission="zope.ManageSite"
+ interface="zope.container.interfaces.IWriteContainer"
+ />
</class>
Modified: zam.api/trunk/src/zam/api/testing.py
===================================================================
--- zam.api/trunk/src/zam/api/testing.py 2009-07-06 18:40:32 UTC (rev 101661)
+++ zam.api/trunk/src/zam/api/testing.py 2009-07-06 18:41:36 UTC (rev 101662)
@@ -22,7 +22,7 @@
from zope.schema.fieldproperty import FieldProperty
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.app.component.interfaces import IPossibleSite
-from zope.app import folder
+from zope.site import folder
from zope.app.component import site
from z3c.baseregistry import baseregistry
More information about the Checkins
mailing list