added zcml extra dependencies, vb to 3.12dev

CHANGES.txt

@@ -2,7 +2,7 @@
 CHANGES
 =======
 
-3.11.2 (unreleased)
+3.12.0 (unreleased)
 -------------------
 
 - Fix detection of moving folders into itself or a subfolder of itself.
@@ -10,6 +10,8 @@ CHANGES
 
 - Fixed ZCML-related tests and dependencies.
 
+- Added ``zcml`` extra dependencies.
+
 3.11.1 (2010-04-30)
 -------------------
 

buildout.cfg

@@ -4,7 +4,7 @@ parts = test graph coverage-test coverage-report
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.container[test]
+eggs = zope.container[test,zcml]
 
 [graph]
 recipe = zc.recipe.egg

setup.py

@@ -25,7 +25,7 @@ def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.container',
-      version = '3.11.2dev',
+      version = '3.12.0dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Zope Container',
@@ -61,17 +61,21 @@ setup(name='zope.container',
                               ], include_dirs=['include']),
                    ],
       extras_require=dict(
-          test=['zope.configuration',
-                'zope.testing',
+          test=['zope.testing',
+                ],
+          zcml=[
+                'zope.component[zcml]',
+                'zope.configuration',
+                'zope.security[zcml]>=3.8.0dev',
                 ]),
       install_requires=['setuptools',
                         'zope.interface',
                         'zope.dottedname',
                         'zope.schema',
-                        'zope.component[zcml]',
+                        'zope.component',
                         'zope.event',
                         'zope.location>=3.5.4',
-                        'zope.security[zcml]>=3.8.0dev',
+                        'zope.security',
                         'zope.lifecycleevent>=3.5.2',
                         'zope.i18nmessageid',
                         'zope.filerepresentation',