Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Steven Gueguen
slapos
Commits
0a95bd91
Commit
0a95bd91
authored
Jun 21, 2013
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Plain Diff
Merge erp5-component-z2.13 into erp5-cluster-z2.13
Conflicts: stack/erp5/buildout.cfg
parents
7957d694
8fcc4bc2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
32 deletions
+15
-32
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+15
-32
No files found.
stack/erp5/buildout.cfg
View file @
0a95bd91
...
...
@@ -19,7 +19,7 @@ allow-hosts += pybrary.net
extends =
# Exact version of Zope
http://svn.zope.org/repos/main/Zope/tags/2.1
2.26
/versions.cfg
http://svn.zope.org/repos/main/Zope/tags/2.1
3.19
/versions.cfg
../../stack/slapos.cfg
../../component/logrotate/buildout.cfg
../../component/dcron/buildout.cfg
...
...
@@ -44,7 +44,6 @@ extends =
../../component/pil-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pysvn-python/buildout.cfg
../../component/python-2.6/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/python-ldap-python/buildout.cfg
../../component/rdiff-backup/buildout.cfg
...
...
@@ -91,7 +90,6 @@ parts =
w3-validator
tesseract
hookbox
bootstrap2.6
perl-DBD-mariadb
perl-DBI
percona-toolkit
...
...
@@ -134,8 +132,8 @@ parts =
# Local development
slapos.cookbook-repository
check-recipe
slapos.cookbook
-python2.6
slapos.recipe.template
-python2.6
slapos.cookbook
slapos.recipe.template
# Create instance template
template
...
...
@@ -157,18 +155,16 @@ stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[slapos.cookbook
-python2.6
]
[slapos.cookbook]
recipe = zc.recipe.egg
eggs = slapos.cookbook
scripts =
python = python2.6
ugly-depend-on = ${slapos.cookbook-repository:repository} ${slapos.cookbook-repository:branch}
[slapos.recipe.template
-python2.6
]
[slapos.recipe.template]
recipe = zc.recipe.egg
eggs = slapos.recipe.template
scripts =
python = python2.6
[template-jinja2-base]
recipe = slapos.recipe.template:jinja2
...
...
@@ -347,9 +343,6 @@ command =
${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
update-command = ${:command}
[bootstrap2.6]
python = python2.6
[erp5_repository_list]
repository_id_list = erp5
...
...
@@ -371,7 +364,6 @@ update-command = ${:command}
# XXX: Workaround for fact ERP5Type is not an distribution and does not
# expose entry point for test runner
recipe = zc.recipe.egg
python = python2.6
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
entry-points =
...
...
@@ -409,7 +401,6 @@ initialization =
# XXX: Workaround for fact ERP5Type is not an distribution and does not
# expose entry point for test runner
recipe = zc.recipe.egg
python = python2.6
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
entry-points =
...
...
@@ -428,7 +419,6 @@ initialization =
[eggs]
recipe = zc.recipe.egg
python = python2.6
eggs =
${mysql-python:egg}
${lxml-python:egg}
...
...
@@ -498,6 +488,9 @@ eggs =
Products.TIDStorage
Products.LongRequestLogger
# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
zope.app.testing
# Currently forked in our repository
# Products.PortalTransforms
# Dependency for our fork of PortalTransforms
...
...
@@ -509,7 +502,7 @@ eggs =
# parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance
interpreter = python2.
6
interpreter = python2.
7
scripts =
repozo
runzope
...
...
@@ -535,24 +528,8 @@ scripts = zodbanalyze
branch = master
revision = 5c67568c403239bd8e25993602d03c553236fcec
[mysql-python]
python = python2.6
[lxml-python]
python = python2.6
[pil-python]
python = python2.6
[python-ldap-python]
python = python2.6
[pysvn-python]
python = python2.6
[slapos-toolbox]
recipe = zc.recipe.egg
python = ${eggs:python}
eggs =
${lxml-python:egg}
slapos.toolbox
...
...
@@ -563,6 +540,11 @@ scripts =
onetimedownload
zodbpack
[cloudooo]
# cloudooo section tries to use python2.6, which doesn't exist anymore.
# Make it use 2.7 instead.
python = python2.7
[versions]
# pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
Acquisition = 2.13.7nxd001
...
...
@@ -690,3 +672,4 @@ uuid = 1.30
validictory = 0.9.1
xml-marshaller = 0.9.7
xupdate-processor = 0.4
zope.app.testing = 3.8.1 ; BBB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment