Commit bc95011e by Kazuhiko Shiozaki

specify 'python = python2.7' in stack/slapos.cfg:[buildout] only.

1 parent c87690b9
......@@ -22,7 +22,7 @@ git-executable = ${git:location}/bin/git
[cloudooo]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
extra-paths = ${cloudooo-repository:location}
eggs =
${lxml-python:egg}
......
......@@ -12,6 +12,7 @@ PATH = ${libxslt:location}/bin:%(PATH)s
[lxml-python]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = lxml
rpath =
......
......@@ -10,6 +10,7 @@ parts =
[M2Crypto]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = M2Crypto
environment = M2Crypto-env
rpath =
......
......@@ -12,6 +12,7 @@ PATH =${mariadb:location}/bin:%(PATH)s
[mysql-python]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = MySQL-python
depends =
${mariadb:version}
......
......@@ -9,6 +9,7 @@ parts =
[pil-python]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = PIL
include-dirs =
${freetype:location}/include
......
......@@ -9,6 +9,7 @@ versions = versions
[pycrypto-python]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = pycrypto
include-dirs =
${gmp:location}/include
......
......@@ -8,6 +8,7 @@ parts =
[pysvn-python]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg =
pysvn
include-dirs =
......
......@@ -8,6 +8,7 @@ parts =
[python-cffi]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = cffi
environment = python-cffi-env
library-dirs =
......
......@@ -9,6 +9,7 @@ parts =
[python-cryptography]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = cryptography
environment = python-cryptography-env
......
......@@ -8,6 +8,7 @@ extends =
[python-ldap-python]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = python-ldap
rpath =
${openldap:location}/lib
......
......@@ -7,6 +7,7 @@ parts =
[rdiff-backup-build]
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = rdiff-backup
include-dirs =
${librsync:location}/include/
......@@ -18,8 +19,8 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
[rdiff-backup]
# Scripts only generation part for rdiff-backup
unzip = true
recipe = zc.recipe.egg
python = ${buildout:python}
eggs =
${rdiff-backup-build:egg}
entry-points =
......
......@@ -89,18 +89,9 @@ input = inline:
export PS1="[SlapOS env Active] $PS1"
output = ${buildout:directory}/environment.sh
[lxml-python]
python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
[slapos]
recipe = z3c.recipe.scripts
python = python2.7
python = ${buildout:python}
eggs =
${python-cffi:egg}
${python-cryptography:egg}
......@@ -134,9 +125,9 @@ scripts =
[py]
recipe = zc.recipe.egg
python = ${buildout:python}
eggs =
${slapos:eggs}
python = python2.7
interpreter = py
scripts = py
......
......@@ -64,16 +64,7 @@ scripts =
slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
slapproxy = slapos.proxy:main
python = python2.7
[lxml-python]
python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
python = ${buildout:python}
[template]
recipe = slapos.recipe.template
......
......@@ -39,7 +39,7 @@ module = etherpad-lite
[instance-recipe-egg]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
eggs = ${instance-recipe:egg}
[etherpad-lite-repository]
......@@ -95,6 +95,3 @@ output = ${etherpad-lite-repository:location}/bin/installDeps.sh
recipe = plone.recipe.command
command = ${template-deps-script:output}
update-command = command
[lxml-python]
python = python2.7
......@@ -32,11 +32,6 @@ eggs =
${lxml-python:egg}
#END LXML
#LXML
[lxml-python]
python = python2.7
#END LXML
[base-template]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename}.in
......
......@@ -23,29 +23,18 @@ parts =
firefox
xwd
unzip = true
[lxml-python]
python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
[instance-recipe]
egg = slapos.cookbook
module = seleniumrunner
[instance-recipe-egg]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
eggs = ${instance-recipe:egg}
[eggs]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
eggs =
${lxml-python:egg}
......
......@@ -31,7 +31,7 @@ mode = 0644
[instance-recipe-egg]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
eggs =
${mysql-python:egg}
${instance-recipe:egg}
......
......@@ -48,12 +48,9 @@ allow-hosts +=
*.edgewall.org
*.edgewall.com
[lxml-python]
python = python2.7
[instance-egg]
recipe = z3c.recipe.scripts
python = python2.7
python = ${buildout:python}
eggs =
${mysql-python:egg}
slapos.toolbox
......
......@@ -92,7 +92,7 @@ mode = 640
[eggs]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
eggs =
${lxml-python:egg}
erp5.util
......@@ -102,12 +102,9 @@ eggs =
scripts =
web_checker_utility = erp5.util.webchecker:web_checker_utility
[lxml-python]
python = python2.7
[slapos-toolbox]
recipe = zc.recipe.egg
python = ${eggs:python}
python = ${buildout:python}
eggs =
${lxml-python:egg}
slapos.toolbox
......
......@@ -360,7 +360,7 @@ 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.7
python = ${buildout:python}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
entry-points =
......@@ -398,7 +398,7 @@ 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.7
python = ${buildout:python}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
entry-points =
......@@ -417,6 +417,7 @@ initialization =
[patched-eggs]
recipe = minitage.recipe.egg
python = ${buildout:python}
eggs =
Acquisition
Products.DCWorkflow
......@@ -433,7 +434,7 @@ ZODB3-patch-binary = ${patch:location}/bin/patch
[eggs]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
eggs =
${mysql-python:egg}
${lxml-python:egg}
......@@ -524,7 +525,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.7
interpreter = ${buildout:python}
scripts =
repozo
runzope
......@@ -538,7 +539,7 @@ extra-paths =
[zodbanalyze]
recipe = zc.recipe.egg
python = python2.7
python = ${buildout:python}
eggs =
ZODB3
erp5.util
......@@ -550,24 +551,9 @@ scripts = zodbanalyze
branch =
revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd
[mysql-python]
python = python2.7
[lxml-python]
python = python2.7
[pil-python]
python = python2.7
[python-ldap-python]
python = python2.7
[pysvn-python]
python = python2.7
[slapos-toolbox]
recipe = zc.recipe.egg
python = ${eggs:python}
python = ${buildout:python}
eggs =
${lxml-python:egg}
slapos.toolbox
......
......@@ -2,6 +2,8 @@
# Software Releases or Stacks can safely extend this stack.
[buildout]
python = python2.7
# Developers need to add explicitely this part in their software profile
# parts = slapos-cookbook
......@@ -62,6 +64,7 @@ networkcache-section = networkcache
# if using "develop"
[slapos-cookbook]
recipe = zc.recipe.egg
python = ${buildout:python}
eggs =
${lxml-python:egg}
${python-cffi:egg}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!