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

stack/slapos: introduce slapos-toolbox-dependencies

section to install dependencies of slapos.toolbox using slapos libraries
parent cef0d3f0
Pipeline #11179 failed with stage
in 0 seconds
...@@ -87,7 +87,9 @@ setup = ${slapos.recipe.template-repository:location} ...@@ -87,7 +87,9 @@ setup = ${slapos.recipe.template-repository:location}
<= setup-develop-egg <= setup-develop-egg
egg = slapos.toolbox[test] egg = slapos.toolbox[test]
setup = ${slapos.toolbox-repository:location} setup = ${slapos.toolbox-repository:location}
depends = ${slapos.core-setup:egg} depends =
${slapos.core-setup:egg}
${slapos-toolbox-dependencies:eggs}
[slapos.rebootstrap-setup] [slapos.rebootstrap-setup]
<= setup-develop-egg <= setup-develop-egg
......
...@@ -562,10 +562,11 @@ setup = ${erp5:location} ...@@ -562,10 +562,11 @@ setup = ${erp5:location}
[zodbpack] [zodbpack]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${slapos-toolbox:dependencies}
slapos.toolbox[zodbpack] slapos.toolbox[zodbpack]
scripts = scripts =
zodbpack zodbpack
depends =
${slapos-toolbox-dependencies:eggs}
[versions] [versions]
# See ../../software/neoppod/software-common.cfg for versions common with NEO: # See ../../software/neoppod/software-common.cfg for versions common with NEO:
......
...@@ -21,6 +21,7 @@ develop = true ...@@ -21,6 +21,7 @@ develop = true
recipe = zc.recipe.egg:develop recipe = zc.recipe.egg:develop
egg = slapos.toolbox egg = slapos.toolbox
setup = ${slapos.toolbox-repository:location} setup = ${slapos.toolbox-repository:location}
depends = ${slapos-toolbox-dependencies:eggs}
[slapos.cookbook-repository] [slapos.cookbook-repository]
develop = true develop = true
......
...@@ -102,16 +102,19 @@ eggs = ...@@ -102,16 +102,19 @@ eggs =
${python-cliff:egg} ${python-cliff:egg}
${python-cryptography:egg} ${python-cryptography:egg}
${jsonschema:egg} ${jsonschema:egg}
pyOpenSSL
slapos.cookbook
# slapos.toolbox containing utilities # slapos.toolbox containing utilities
[slapos-toolbox] [slapos-toolbox]
recipe = zc.recipe.egg 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 = eggs =
${:dependencies}
slapos.toolbox
dependencies =
${lxml-python:egg} ${lxml-python:egg}
${pycurl:egg} ${pycurl:egg}
${python-cryptography: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