[Checkins] SVN: Sandbox/gotcha/five.taskqueue/trunk/ zope 2.13 compatibility

[Godefroid Chapelle]

Log message for revision 127911:
  zope 2.13 compatibility

Changed:
  U   Sandbox/gotcha/five.taskqueue/trunk/buildout.cfg
  U   Sandbox/gotcha/five.taskqueue/trunk/setup.py

-=-
Modified: Sandbox/gotcha/five.taskqueue/trunk/buildout.cfg
===================================================================
--- Sandbox/gotcha/five.taskqueue/trunk/buildout.cfg	2012-10-04 11:59:34 UTC (rev 127910)
+++ Sandbox/gotcha/five.taskqueue/trunk/buildout.cfg	2012-10-04 12:14:15 UTC (rev 127911)
@@ -1,8 +1,8 @@
 [buildout]
 extensions = mr.developer
 develop = .
-parts = zope2 instance test test-coverage z3c.coverage omelette py
-extends = http://dist.plone.org/release/3.3.5/versions.cfg 
+parts = instance test test-coverage z3c.coverage omelette py
+extends = http://dist.plone.org/release/4.1/versions.cfg 
 versions = versions
 sources-dir = devel
 
@@ -11,7 +11,6 @@
 
 [instance]
 recipe = plone.recipe.zope2instance
-zope2-location = ${zope2:location}
 user = admin:admin
 eggs = five.taskqueue 
 zcml = five.taskqueue
@@ -23,23 +22,8 @@
 [test]
 recipe = zc.recipe.testrunner
 defaults = ['--tests-pattern', '^f?tests$']
-extra-paths = ${zope2:location}/lib/python
 eggs = ${instance:eggs} 
 
-[zope2]
-recipe = plone.recipe.zope2install
-url = ${versions:zope2-url}
-fake-zope-eggs = true
-skip-fake-eggs = docutils
-                 zope.testing
-                 zope.schema
-                 zope.exceptions
-                 zope.configuration
-                 zope.component
-                 zope.interface
-                 zope.location
-                 zope.proxy
-
 [py]
 recipe = zc.recipe.egg
 interpreter = py
@@ -49,7 +33,6 @@
 recipe = zc.recipe.testrunner
 eggs = ${test:eggs}
 defaults = ['--coverage', '${buildout:directory}/coverage', '--auto-progress']
-extra-paths = ${test:extra-paths}
 
 [z3c.coverage]
 recipe = zc.recipe.egg
@@ -60,18 +43,3 @@
 [omelette]
 recipe = collective.recipe.omelette
 eggs = ${test:eggs}
-products =
-packages = ${zope2:location}/lib/python ./
-
-[versions]
-zope.component = 3.5.1
-zope.configuration = 3.5.0
-zope.container = 3.7.1
-zope.location = 3.5
-zope.site = 3.6.0
-zope.schema = 3.6.1
-zope.interface = 3.5.2
-zope.testing = 3.9.5
-mr.developer = 1.7 
-zc.recipe.testrunner = 1.2.0
-zope.app.testing = 3.6.0

Modified: Sandbox/gotcha/five.taskqueue/trunk/setup.py
===================================================================
--- Sandbox/gotcha/five.taskqueue/trunk/setup.py	2012-10-04 11:59:34 UTC (rev 127910)
+++ Sandbox/gotcha/five.taskqueue/trunk/setup.py	2012-10-04 12:14:15 UTC (rev 127911)
@@ -23,6 +23,7 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
+          'Zope2',
           'z3c.taskqueue',
       ],
       entry_points="""