Commit aaa2564a authored by Jérome Perrin's avatar Jérome Perrin

Fix installation of slapos.toolbox

Since f3613b91 (version up slapos.toolbox 0.110, 2020-08-21) slapos.toolbox needs lzma, which should always be installed with slapos component, because letting buildout install the egg from pypi would build against system libzma library (or fail if not present).
This introduce `*-dependencies` sections for eggs that have some dependencies that needs to be installed by slapos and use it, especially in section which install eggs from git for testing.

See merge request nexedi/slapos!804
parents a9b40cac fdb95860
......@@ -57,7 +57,9 @@ depends = ${slapos.core-setup:egg}
<= setup-develop-egg
egg = slapos.cookbook[test]
setup = ${slapos.cookbook-repository:location}
depends = ${slapos.core-setup:egg}
depends =
${slapos.core-setup:egg}
${slapos-cookbook-dependencies:eggs}
[slapos.core-setup]
<= setup-develop-egg
......@@ -85,7 +87,9 @@ setup = ${slapos.recipe.template-repository:location}
<= setup-develop-egg
egg = slapos.toolbox[test]
setup = ${slapos.toolbox-repository:location}
depends = ${slapos.core-setup:egg}
depends =
${slapos.core-setup:egg}
${slapos-toolbox-dependencies:eggs}
[slapos.rebootstrap-setup]
<= setup-develop-egg
......
......@@ -562,10 +562,11 @@ setup = ${erp5:location}
[zodbpack]
recipe = zc.recipe.egg
eggs =
${slapos-toolbox:dependencies}
slapos.toolbox[zodbpack]
scripts =
zodbpack
depends =
${slapos-toolbox-dependencies:eggs}
[versions]
# See ../../software/neoppod/software-common.cfg for versions common with NEO:
......
......@@ -21,6 +21,7 @@ develop = true
recipe = zc.recipe.egg:develop
egg = slapos.toolbox
setup = ${slapos.toolbox-repository:location}
depends = ${slapos-toolbox-dependencies:eggs}
[slapos.cookbook-repository]
develop = true
......
......@@ -89,6 +89,11 @@ setup = ${slapos.cookbook-repository:location}
# Install slapos.cookbook containing all officials recipes
[slapos-cookbook]
recipe = zc.recipe.egg
eggs = slapos.cookbook
depends = ${slapos-cookbook-dependencies:eggs}
[slapos-cookbook-dependencies]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${python-cffi:egg}
......@@ -97,16 +102,19 @@ eggs =
${python-cliff:egg}
${python-cryptography:egg}
${jsonschema:egg}
pyOpenSSL
slapos.cookbook
# slapos.toolbox containing utilities
[slapos-toolbox]
recipe = zc.recipe.egg
eggs = slapos.toolbox
depends = ${slapos-toolbox-dependencies:eggs}
[slapos-toolbox-dependencies]
# slapos.toolbox depends on eggs with C-extensions that needs to be
# installed with slapos provided libraries. This section installs all
# slapos.toolbox dependencies.
recipe = zc.recipe.egg
eggs =
${:dependencies}
slapos.toolbox
dependencies =
${lxml-python:egg}
${pycurl:egg}
${python-cryptography: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