[Checkins] SVN: zope.securitypolicy/trunk/ - Added test extra to declare test dependency on ``zope.component [test]``.

Michael Howitz mh at gocept.com
Sat Sep 25 07:55:47 EDT 2010


Log message for revision 116846:
  - Added test extra to declare test dependency on ``zope.component [test]``.
  
  - Added an extra named `dublincore` to express optional dependency on
    `zope.dublincore >= 3.7`.
  
  - Added tests for ZCML files making sure they include everything they need.
  
  - Next release will be 3.7.0
  
  

Changed:
  U   zope.securitypolicy/trunk/CHANGES.txt
  U   zope.securitypolicy/trunk/buildout.cfg
  U   zope.securitypolicy/trunk/setup.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/configure.zcml
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py

-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt	2010-09-25 11:34:48 UTC (rev 116845)
+++ zope.securitypolicy/trunk/CHANGES.txt	2010-09-25 11:55:46 UTC (rev 116846)
@@ -2,7 +2,7 @@
 CHANGES
 =======
 
-3.6.2 (unreleased)
+3.7.0 (unreleased)
 ------------------
 
 - LP #131115: Clean up inconsistency in ``getSetting`` interface definitions
@@ -17,6 +17,14 @@
 
 - AnnotationGrantInfo implements IGrantInfo.
 
+- Added test extra to declare test dependency on ``zope.component [test]``.
+
+- Added an extra named `dublincore` to express optional dependency on
+  `zope.dublincore >= 3.7`.
+
+- Added tests for ZCML files making sure they include everything they need.
+
+
 3.6.1 (2009-07-24)
 ------------------
 

Modified: zope.securitypolicy/trunk/buildout.cfg
===================================================================
--- zope.securitypolicy/trunk/buildout.cfg	2010-09-25 11:34:48 UTC (rev 116845)
+++ zope.securitypolicy/trunk/buildout.cfg	2010-09-25 11:55:46 UTC (rev 116846)
@@ -4,4 +4,4 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.securitypolicy
+eggs = zope.securitypolicy [test, dublincore]

Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py	2010-09-25 11:34:48 UTC (rev 116845)
+++ zope.securitypolicy/trunk/setup.py	2010-09-25 11:55:46 UTC (rev 116846)
@@ -28,7 +28,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.securitypolicy',
-    version='3.6.2dev',
+    version='3.7.0dev',
     author='Zope Foundation and Contributors',
     author_email='zope-dev at zope.org',
     description='Default security policy for Zope3',
@@ -67,6 +67,13 @@
         'zope.schema',
         'zope.security',
         ],
+    extras_require=dict(
+          test=[
+              'zope.component [test]',
+              ],
+          dublincore=[
+              'zope.dublincore >= 3.7',
+              ]),
     include_package_data=True,
     zip_safe=False,
     )

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/configure.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/configure.zcml	2010-09-25 11:34:48 UTC (rev 116845)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/configure.zcml	2010-09-25 11:55:46 UTC (rev 116846)
@@ -3,6 +3,10 @@
     i18n_domain="zope"
     >
 
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
+  <include package="zope.security" />
+
   <adapter
       factory=".rolepermission.AnnotationRolePermissionManager"
       provides=".interfaces.IRolePermissionManager"

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml	2010-09-25 11:34:48 UTC (rev 116845)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml	2010-09-25 11:55:46 UTC (rev 116846)
@@ -6,6 +6,7 @@
 
   <!-- This file contains sample security policy definition -->
 
+  <include package="zope.securitypolicy" file="meta.zcml" />
   <include package="zope.securitypolicy" />
 
   <securityPolicy

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py	2010-09-25 11:34:48 UTC (rev 116845)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py	2010-09-25 11:55:46 UTC (rev 116846)
@@ -36,6 +36,25 @@
 from zope.securitypolicy.grantinfo import \
      AnnotationGrantInfo
 
+class TestZCML(unittest.TestCase):
+
+    def testMetaZCML(self):
+        import zope.configuration
+        import zope.securitypolicy
+        zope.configuration.xmlconfig.file("meta.zcml", zope.securitypolicy)
+
+    def testConfigureZCML(self):
+        import zope.configuration
+        import zope.securitypolicy
+        zope.configuration.xmlconfig.file("configure.zcml", zope.securitypolicy)
+
+    def testSecuritypolicyZCML(self):
+        import zope.configuration
+        import zope.securitypolicy
+        zope.configuration.xmlconfig.file(
+            "securitypolicy.zcml", zope.securitypolicy)
+
+
 def setUp(test):
     componentSetUp()
     endInteraction()
@@ -54,7 +73,5 @@
         DocFileSuite('zopepolicy.txt',
             package='zope.securitypolicy',
             setUp=setUp, tearDown=componentTearDown),
+        unittest.makeSuite(TestZCML),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')



More information about the checkins mailing list