Commit 303ce299 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Install pbr egg before installing cliff egg.

parent ac2ed299
[buildout]
[python-cliff]
recipe = zc.recipe.egg:custom
egg = cliff
setup-eggs = ${python-cliff-prep:eggs}
[python-cliff-prep]
recipe = zc.recipe.egg
eggs =
pbr
......@@ -29,7 +29,6 @@ parts =
eggs
instance-runner-import
instance-runner-export
slapos-cookbook
template-slapos-cfg
# XXX: we have to manually add this for resilience
rdiff-backup
......@@ -175,42 +174,15 @@ mode = 0644
[eggs]
recipe = z3c.recipe.scripts
eggs =
${lxml-python:egg}
collective.recipe.environment
cns.recipe.symlink
erp5.util
hexagonit.recipe.download
inotifyx
lock-file
lxml
netaddr
plone.recipe.command
pytz
slapos.cookbook
slapos.libnetworkcache
slapos.recipe.build
slapos.toolbox[flask_auth]
slapos.core
supervisor
xml_marshaller
Gunicorn
# Add slapos.libnetworkcache to path of slapos.core so that slaprunner can build SRs using cache
[slapos-cookbook]
eggs =
${lxml-python:egg}
slapos.cookbook
cliff
hexagonit.recipe.download
inotifyx
netaddr
netifaces
requests
slapos.core
supervisor
xml_marshaller
pytz
slapos.libnetworkcache
${slapos-cookbook:eggs}
[extra-eggs]
recipe = zc.recipe.egg
......
......@@ -23,6 +23,7 @@ extends =
../component/python-2.7/buildout.cfg
../component/lxml-python/buildout.cfg
../component/python-cffi/buildout.cfg
../component/python-cliff/buildout.cfg
../component/python-cryptography/buildout.cfg
# Separate from site eggs
......@@ -84,10 +85,11 @@ recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${python-cffi:egg}
${python-cliff:egg}
${python-cryptography:egg}
pyOpenSSL
slapos.cookbook
cliff
slapos.libnetworkcache
hexagonit.recipe.download
inotifyx
netaddr
......@@ -162,7 +164,7 @@ netifaces = 0.10.4
# Required by:
# cliff==1.9.0
# stevedore==1.1.0
pbr = 0.10.0
pbr = 0.10.4
# Required by:
# pbr==0.10.0
......
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