Commit a9bd7844 authored by Julien Muchembled's avatar Julien Muchembled

Make ERP5 use Zope 2.13 (and Python 2.7)

parent 61b1dd0a
...@@ -17,7 +17,7 @@ find-links = ...@@ -17,7 +17,7 @@ find-links =
extends = extends =
# Exact version of Zope # Exact version of Zope
http://svn.zope.org/repos/main/Zope/tags/2.12.25/versions.cfg http://svn.zope.org/repos/main/Zope/tags/2.13.19/versions.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
...@@ -44,7 +44,6 @@ extends = ...@@ -44,7 +44,6 @@ extends =
../../component/pil-python/buildout.cfg ../../component/pil-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg ../../component/pycrypto-python/buildout.cfg
../../component/pysvn-python/buildout.cfg ../../component/pysvn-python/buildout.cfg
../../component/python-2.6/buildout.cfg
../../component/python-2.7/buildout.cfg ../../component/python-2.7/buildout.cfg
../../component/python-ldap-python/buildout.cfg ../../component/python-ldap-python/buildout.cfg
../../component/rdiff-backup/buildout.cfg ../../component/rdiff-backup/buildout.cfg
...@@ -92,7 +91,6 @@ parts = ...@@ -92,7 +91,6 @@ parts =
w3-validator w3-validator
tesseract tesseract
hookbox hookbox
bootstrap2.6
perl-DBD-mariadb perl-DBD-mariadb
perl-DBI perl-DBI
percona-toolkit percona-toolkit
...@@ -135,8 +133,6 @@ parts = ...@@ -135,8 +133,6 @@ parts =
# Local development # Local development
slapos.cookbook-repository slapos.cookbook-repository
check-recipe check-recipe
slapos.cookbook-python2.6
slapos.recipe.template-python2.6
# Create instance template # Create instance template
template template
...@@ -156,19 +152,6 @@ stop-on-error = true ...@@ -156,19 +152,6 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[slapos.cookbook-python2.6]
recipe = zc.recipe.egg
eggs = slapos.cookbook
scripts =
python = python2.6
ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
[slapos.recipe.template-python2.6]
recipe = zc.recipe.egg
eggs = slapos.recipe.template
scripts =
python = python2.6
[template-jinja2-base] [template-jinja2-base]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename}.in template = ${:_profile_base_location_}/${:filename}.in
...@@ -342,9 +325,6 @@ command = ...@@ -342,9 +325,6 @@ command =
${buildout:executable} ${:genbt5list} ${local-bt5-repository:list} ${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
update-command = ${:command} update-command = ${:command}
[bootstrap2.6]
python = python2.6
[erp5_repository_list] [erp5_repository_list]
repository_id_list = erp5 repository_id_list = erp5
...@@ -373,7 +353,7 @@ update-command = ${:command} ...@@ -373,7 +353,7 @@ update-command = ${:command}
# XXX: Workaround for fact ERP5Type is not an distribution and does not # XXX: Workaround for fact ERP5Type is not an distribution and does not
# expose entry point for test runner # expose entry point for test runner
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = python2.6 python = python2.7
eggs = ${eggs:eggs} eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths} extra-paths = ${eggs:extra-paths}
entry-points = entry-points =
...@@ -406,7 +386,7 @@ initialization = ...@@ -406,7 +386,7 @@ initialization =
# XXX: Workaround for fact ERP5Type is not an distribution and does not # XXX: Workaround for fact ERP5Type is not an distribution and does not
# expose entry point for test runner # expose entry point for test runner
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = python2.6 python = python2.7
eggs = ${eggs:eggs} eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths} extra-paths = ${eggs:extra-paths}
entry-points = entry-points =
...@@ -425,7 +405,7 @@ initialization = ...@@ -425,7 +405,7 @@ initialization =
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = python2.6 python = python2.7
eggs = eggs =
${mysql-python:egg} ${mysql-python:egg}
${lxml-python:egg} ${lxml-python:egg}
...@@ -491,6 +471,10 @@ eggs = ...@@ -491,6 +471,10 @@ eggs =
Products.ExternalEditor Products.ExternalEditor
Products.TIDStorage Products.TIDStorage
# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
# (for tests like testCookieCrumbler).
zope.app.testing
# Currently forked in our repository # Currently forked in our repository
# Products.PortalTransforms # Products.PortalTransforms
# Dependency for our fork of PortalTransforms # Dependency for our fork of PortalTransforms
...@@ -502,7 +486,7 @@ eggs = ...@@ -502,7 +486,7 @@ eggs =
# parameterizing the version of the generated python interpreter name by the # parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the # python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance # installation of python, which we don't want on an instance
interpreter = python2.6 interpreter = python2.7
scripts = scripts =
repozo repozo
runzope runzope
...@@ -519,19 +503,19 @@ branch = master ...@@ -519,19 +503,19 @@ branch = master
revision = 4cdfffb3f81a0fdbb7b372d92de664e716f12d4b revision = 4cdfffb3f81a0fdbb7b372d92de664e716f12d4b
[mysql-python] [mysql-python]
python = python2.6 python = python2.7
[lxml-python] [lxml-python]
python = python2.6 python = python2.7
[pil-python] [pil-python]
python = python2.6 python = python2.7
[python-ldap-python] [python-ldap-python]
python = python2.6 python = python2.7
[pysvn-python] [pysvn-python]
python = python2.6 python = python2.7
[slapos-toolbox] [slapos-toolbox]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -605,7 +589,7 @@ coverage = 3.5.2 ...@@ -605,7 +589,7 @@ coverage = 3.5.2
csp-eventlet = 0.7.0 csp-eventlet = 0.7.0
elementtree = 1.2.7-20070827-preview elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3 erp5.recipe.cmmiforcei686 = 0.1.3
erp5.util = 0.4.7 erp5.util = 0.4.22
erp5diff = 0.8.1.5 erp5diff = 0.8.1.5
eventlet = 0.9.17 eventlet = 0.9.17
feedparser = 5.1.2 feedparser = 5.1.2
...@@ -651,3 +635,4 @@ xupdate-processor = 0.4 ...@@ -651,3 +635,4 @@ xupdate-processor = 0.4
mr.developer = 1.21 mr.developer = 1.21
qrcode = 2.4.1 qrcode = 2.4.1
requests = 0.13.2 requests = 0.13.2
zope.app.testing = 3.8.1 ; BBB
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment