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
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
cca6825a
Commit
cca6825a
authored
Aug 30, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop python2.6 .
Use 2.7 instead.
parent
1381fd3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
31 deletions
+10
-31
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+10
-31
No files found.
stack/erp5/buildout.cfg
View file @
cca6825a
...
@@ -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
...
@@ -94,7 +93,6 @@ parts =
...
@@ -94,7 +93,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
...
@@ -136,8 +134,8 @@ parts =
...
@@ -136,8 +134,8 @@ parts =
# Local development
# Local development
slapos.cookbook-repository
slapos.cookbook-repository
check-recipe
check-recipe
slapos.cookbook
-python2.6
slapos.cookbook
slapos.recipe.template
-python2.6
slapos.recipe.template
# Create instance template
# Create instance template
template
template
...
@@ -157,18 +155,16 @@ stop-on-error = true
...
@@ -157,18 +155,16 @@ 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
]
[slapos.cookbook]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs = slapos.cookbook
eggs = slapos.cookbook
scripts =
scripts =
python = python2.6
ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
[slapos.recipe.template
-python2.6
]
[slapos.recipe.template]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs = slapos.recipe.template
eggs = slapos.recipe.template
scripts =
scripts =
python = python2.6
[template-jinja2-base]
[template-jinja2-base]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -351,9 +347,6 @@ command =
...
@@ -351,9 +347,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
...
@@ -382,7 +375,6 @@ update-command = ${:command}
...
@@ -382,7 +375,6 @@ 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
eggs = ${eggs:eggs}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
extra-paths = ${eggs:extra-paths}
entry-points =
entry-points =
...
@@ -415,7 +407,6 @@ initialization =
...
@@ -415,7 +407,6 @@ 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
eggs = ${eggs:eggs}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
extra-paths = ${eggs:extra-paths}
entry-points =
entry-points =
...
@@ -434,7 +425,6 @@ initialization =
...
@@ -434,7 +425,6 @@ initialization =
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.6
eggs =
eggs =
${mysql-python:egg}
${mysql-python:egg}
${lxml-python:egg}
${lxml-python:egg}
...
@@ -511,7 +501,7 @@ eggs =
...
@@ -511,7 +501,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
...
@@ -527,24 +517,8 @@ extra-paths =
...
@@ -527,24 +517,8 @@ extra-paths =
branch = master
branch = master
revision = 4cdfffb3f81a0fdbb7b372d92de664e716f12d4b
revision = 4cdfffb3f81a0fdbb7b372d92de664e716f12d4b
[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]
[slapos-toolbox]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = ${eggs:python}
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
slapos.toolbox
slapos.toolbox
...
@@ -555,6 +529,11 @@ scripts =
...
@@ -555,6 +529,11 @@ scripts =
onetimedownload
onetimedownload
zodbpack
zodbpack
[cloudooo]
# cloudooo section tries to use python2.6, which doesn't exist anymore.
# Make it use 2.7 instead.
python = python2.7
[versions]
[versions]
# pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
# pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
Acquisition = 2.13.7nxd001
Acquisition = 2.13.7nxd001
...
...
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