Commit 5ae3b0ba authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

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

no need to specify 'python = ${buildout:python}' because it is the default behaviour.
parent 63f450af
...@@ -22,7 +22,6 @@ git-executable = ${git:location}/bin/git ...@@ -22,7 +22,6 @@ git-executable = ${git:location}/bin/git
[cloudooo] [cloudooo]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
extra-paths = ${cloudooo-repository:location} extra-paths = ${cloudooo-repository:location}
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
......
...@@ -12,7 +12,6 @@ PATH = ${libxslt:location}/bin:%(PATH)s ...@@ -12,7 +12,6 @@ PATH = ${libxslt:location}/bin:%(PATH)s
[lxml-python] [lxml-python]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = lxml egg = lxml
rpath = rpath =
......
...@@ -10,7 +10,6 @@ parts = ...@@ -10,7 +10,6 @@ parts =
[M2Crypto] [M2Crypto]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = M2Crypto egg = M2Crypto
environment = M2Crypto-env environment = M2Crypto-env
rpath = rpath =
......
...@@ -12,7 +12,6 @@ PATH =${mariadb:location}/bin:%(PATH)s ...@@ -12,7 +12,6 @@ PATH =${mariadb:location}/bin:%(PATH)s
[mysql-python] [mysql-python]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = MySQL-python egg = MySQL-python
depends = depends =
${mariadb:version} ${mariadb:version}
......
...@@ -9,7 +9,6 @@ parts = ...@@ -9,7 +9,6 @@ parts =
[pil-python] [pil-python]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = PIL egg = PIL
include-dirs = include-dirs =
${freetype:location}/include ${freetype:location}/include
......
...@@ -9,7 +9,6 @@ versions = versions ...@@ -9,7 +9,6 @@ versions = versions
[pycrypto-python] [pycrypto-python]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = pycrypto egg = pycrypto
include-dirs = include-dirs =
${gmp:location}/include ${gmp:location}/include
......
...@@ -8,7 +8,6 @@ parts = ...@@ -8,7 +8,6 @@ parts =
[pysvn-python] [pysvn-python]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = egg =
pysvn pysvn
include-dirs = include-dirs =
......
...@@ -8,7 +8,6 @@ parts = ...@@ -8,7 +8,6 @@ parts =
[python-cffi] [python-cffi]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = cffi egg = cffi
environment = python-cffi-env environment = python-cffi-env
library-dirs = library-dirs =
......
...@@ -9,7 +9,6 @@ parts = ...@@ -9,7 +9,6 @@ parts =
[python-cryptography] [python-cryptography]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = cryptography egg = cryptography
environment = python-cryptography-env environment = python-cryptography-env
......
...@@ -8,7 +8,6 @@ extends = ...@@ -8,7 +8,6 @@ extends =
[python-ldap-python] [python-ldap-python]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = python-ldap egg = python-ldap
rpath = rpath =
${openldap:location}/lib ${openldap:location}/lib
......
...@@ -7,7 +7,6 @@ parts = ...@@ -7,7 +7,6 @@ parts =
[rdiff-backup-build] [rdiff-backup-build]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = rdiff-backup egg = rdiff-backup
include-dirs = include-dirs =
${librsync:location}/include/ ${librsync:location}/include/
...@@ -20,7 +19,6 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1 ...@@ -20,7 +19,6 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
[rdiff-backup] [rdiff-backup]
# Scripts only generation part for rdiff-backup # Scripts only generation part for rdiff-backup
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${rdiff-backup-build:egg} ${rdiff-backup-build:egg}
entry-points = entry-points =
......
...@@ -91,7 +91,6 @@ output = ${buildout:directory}/environment.sh ...@@ -91,7 +91,6 @@ output = ${buildout:directory}/environment.sh
[slapos] [slapos]
recipe = z3c.recipe.scripts recipe = z3c.recipe.scripts
python = ${buildout:python}
eggs = eggs =
${python-cffi:egg} ${python-cffi:egg}
${python-cryptography:egg} ${python-cryptography:egg}
...@@ -125,7 +124,6 @@ scripts = ...@@ -125,7 +124,6 @@ scripts =
[py] [py]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${slapos:eggs} ${slapos:eggs}
interpreter = py interpreter = py
......
...@@ -64,7 +64,6 @@ scripts = ...@@ -64,7 +64,6 @@ scripts =
slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
slapproxy = slapos.proxy:main slapproxy = slapos.proxy:main
python = ${buildout:python}
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
...@@ -39,7 +39,6 @@ module = etherpad-lite ...@@ -39,7 +39,6 @@ module = etherpad-lite
[instance-recipe-egg] [instance-recipe-egg]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = ${instance-recipe:egg} eggs = ${instance-recipe:egg}
[etherpad-lite-repository] [etherpad-lite-repository]
......
...@@ -29,12 +29,10 @@ module = seleniumrunner ...@@ -29,12 +29,10 @@ module = seleniumrunner
[instance-recipe-egg] [instance-recipe-egg]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = ${instance-recipe:egg} eggs = ${instance-recipe:egg}
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
......
...@@ -31,7 +31,6 @@ mode = 0644 ...@@ -31,7 +31,6 @@ mode = 0644
[instance-recipe-egg] [instance-recipe-egg]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${mysql-python:egg} ${mysql-python:egg}
${instance-recipe:egg} ${instance-recipe:egg}
......
...@@ -50,7 +50,6 @@ allow-hosts += ...@@ -50,7 +50,6 @@ allow-hosts +=
[instance-egg] [instance-egg]
recipe = z3c.recipe.scripts recipe = z3c.recipe.scripts
python = ${buildout:python}
eggs = eggs =
${mysql-python:egg} ${mysql-python:egg}
slapos.toolbox slapos.toolbox
......
...@@ -92,7 +92,6 @@ mode = 640 ...@@ -92,7 +92,6 @@ mode = 640
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
erp5.util erp5.util
...@@ -104,7 +103,6 @@ scripts = ...@@ -104,7 +103,6 @@ scripts =
[slapos-toolbox] [slapos-toolbox]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
slapos.toolbox slapos.toolbox
......
...@@ -360,7 +360,6 @@ update-command = ${:command} ...@@ -360,7 +360,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 = ${buildout:python}
eggs = ${eggs:eggs} eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths} extra-paths = ${eggs:extra-paths}
entry-points = entry-points =
...@@ -398,7 +397,6 @@ initialization = ...@@ -398,7 +397,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 = ${buildout:python}
eggs = ${eggs:eggs} eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths} extra-paths = ${eggs:extra-paths}
entry-points = entry-points =
...@@ -417,7 +415,6 @@ initialization = ...@@ -417,7 +415,6 @@ initialization =
[patched-eggs] [patched-eggs]
recipe = minitage.recipe.egg recipe = minitage.recipe.egg
python = ${buildout:python}
eggs = eggs =
Acquisition Acquisition
Products.DCWorkflow Products.DCWorkflow
...@@ -434,7 +431,6 @@ ZODB3-patch-binary = ${patch:location}/bin/patch ...@@ -434,7 +431,6 @@ ZODB3-patch-binary = ${patch:location}/bin/patch
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${mysql-python:egg} ${mysql-python:egg}
${lxml-python:egg} ${lxml-python:egg}
...@@ -539,7 +535,6 @@ extra-paths = ...@@ -539,7 +535,6 @@ extra-paths =
[zodbanalyze] [zodbanalyze]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
ZODB3 ZODB3
erp5.util erp5.util
...@@ -553,7 +548,6 @@ revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd ...@@ -553,7 +548,6 @@ revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd
[slapos-toolbox] [slapos-toolbox]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
slapos.toolbox slapos.toolbox
......
...@@ -64,7 +64,6 @@ networkcache-section = networkcache ...@@ -64,7 +64,6 @@ networkcache-section = networkcache
# if using "develop" # if using "develop"
[slapos-cookbook] [slapos-cookbook]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = ${buildout:python}
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-cffi:egg} ${python-cffi:egg}
......
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