Log message for revision 98091:
Finally get rid of zope.app.testing test requires, add ZODB3 to install requires, because this package uses persistent.
Changed:
U zope.securitypolicy/trunk/CHANGES.txt
U zope.securitypolicy/trunk/setup.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py
-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt 2009-03-14 11:10:36 UTC (rev 98090)
+++ zope.securitypolicy/trunk/CHANGES.txt 2009-03-14 11:20:13 UTC (rev 98091)
@@ -8,6 +8,9 @@
- Change ``zope.app.security`` dependency to the new ``zope.authentication``
package, dropping a big number of unused dependencies.
+- Get rid of ``zope.app.testing`` test dependency. Add ``ZODB3`` to
+ install dependencies, because we use `Persistent` class.
+
3.5.1 (2009-03-10)
------------------
Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py 2009-03-14 11:10:36 UTC (rev 98090)
+++ zope.securitypolicy/trunk/setup.py 2009-03-14 11:20:13 UTC (rev 98091)
@@ -52,10 +52,10 @@
package_dir={'': 'src'},
namespace_packages=['zope'],
extras_require=dict(
- test=['zope.app.testing',
- 'zope.principalregistry']),
+ test=['zope.testing', 'zope.principalregistry']),
install_requires=[
'setuptools',
+ 'ZODB3',
'zope.annotation',
'zope.authentication',
'zope.component',
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py 2009-03-14 11:10:36 UTC (rev 98090)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py 2009-03-14 11:20:13 UTC (rev 98091)
@@ -21,7 +21,8 @@
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.principalregistry.principalregistry import principalRegistry
-from zope.app.component.testing import PlacefulSetup
+from zope.component.testing import PlacelessSetup
+from zope.annotation.attribute import AttributeAnnotations
from zope.securitypolicy.principalrole import AnnotationPrincipalRoleManager
from zope.securitypolicy.interfaces import Allow, Deny
@@ -36,10 +37,11 @@
zope.component.provideUtility(role, IRole, name=role.id)
return role
-class Test(PlacefulSetup, unittest.TestCase):
-
+class Test(PlacelessSetup, unittest.TestCase):
+
def setUp(self):
- PlacefulSetup.setUp(self)
+ PlacelessSetup.setUp(self)
+ zope.component.provideAdapter(AttributeAnnotations)
def _make_principal(self, id=None, title=None):
p = principalRegistry.definePrincipal(
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py 2009-03-14 11:10:36 UTC (rev 98090)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py 2009-03-14 11:20:13 UTC (rev 98091)
@@ -16,14 +16,14 @@
$Id$
"""
import unittest
-from zope.component import provideUtility
+from zope.component import provideUtility, provideAdapter
+from zope.component.testing import PlacelessSetup
from zope.interface import implements
+from zope.annotation.attribute import AttributeAnnotations
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.security.interfaces import IPermission
from zope.security.permission import Permission
-from zope.app.component.testing import PlacefulSetup
-
from zope.securitypolicy.role import Role
from zope.securitypolicy.interfaces import Allow, Deny
from zope.securitypolicy.interfaces import IRole
@@ -32,11 +32,13 @@
class Manageable(object):
implements(IAttributeAnnotatable)
-class Test(PlacefulSetup, unittest.TestCase):
+class Test(PlacelessSetup, unittest.TestCase):
def setUp(self):
- PlacefulSetup.setUp(self)
+ PlacelessSetup.setUp(self)
+ provideAdapter(AttributeAnnotations)
+
read = Permission('read', 'Read Something')
provideUtility(read, IPermission, read.id)
self.read = read.id