Commit 0ce9ba5d authored by Julien Muchembled's avatar Julien Muchembled

Remove useless explicit egg dependencies

parent 51740961
......@@ -27,10 +27,9 @@ eggs =
zc.buildout
slapos.libnetworkcache
slapos.core
supervisor
jsonschema
hexagonit.recipe.download
netaddr
inotifyx
lock_file
pytz
erp5.util
......
......@@ -71,21 +71,3 @@ mode = 0644
recipe = zc.recipe.egg
eggs =
collective.recipe.template
# Add slapos.libnetworkcache to path of slapos.core.
[slapos-cookbook]
eggs =
${lxml-python:egg}
slapos.cookbook
cliff
hexagonit.recipe.download
inotifyx
netaddr
netifaces
requests
slapos.core
supervisor
xml_marshaller
pytz
slapos.libnetworkcache
......@@ -106,23 +106,11 @@ versions = versions
networkcache-section = networkcache
# Install slapos.cookbook containing all officials recipes
# Explicitely define dependencies as well, because of buildout limitation
# if using "develop"
[slapos-cookbook]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
slapos.cookbook
cliff
hexagonit.recipe.download
inotifyx
netaddr
netifaces
requests
slapos.core
supervisor
xml_marshaller
pytz
[versions]
# Use SlapOS patched zc.buildout
......
......@@ -476,7 +476,6 @@ eggs = ${neoppod:eggs}
collective.recipe.template
coverage
erp5diff
inotifyx
interval
ipdb
Jinja2
......
......@@ -78,8 +78,6 @@ recipe = zc.recipe.egg:develop
setup = ${slapos.cookbook-repository:location}
# Install slapos.cookbook containing all officials recipes
# Explicitely define dependencies as well, because of buildout limitation
# if using "develop". XXX really ?
[slapos-cookbook]
recipe = zc.recipe.egg
eggs =
......@@ -91,15 +89,6 @@ eggs =
pyOpenSSL
slapos.cookbook
slapos.libnetworkcache
hexagonit.recipe.download
inotifyx
netaddr
netifaces
requests
slapos.core
supervisor
xml_marshaller
pytz
[versions]
# Use SlapOS patched zc.buildout
......
  • mentioned in merge request !235 (merged)

    Toggle commit list
  • mentioned in merge request !253 (closed)

    Toggle commit list
  • @jm I think this change will break a considerable amount of things. Did you test it before push to master?

  • mentioned in commit 99899916

    Toggle commit list
  • mentioned in commit 99899916

    Toggle commit list
  • mentioned in commit 99899916

    Toggle commit list
  • I have tested erp5 and erp5testnode SR. I didn't test erp5testnode completely and I don't know if it needs supervisor scripts, so I kept it as a precaution. I simply missed slaprunner: I didn't notice that my changes would affect it. The fact is that doing:

    [eggs]
    recipe = zc.recipe.egg
    eggs =
      ...
      ${slapos-cookbook:eggs}

    is questionable, because both sections generate the same scripts with different sys.path.

    About @jerome suggestion to do dependent-scripts = true, it may sometimes be too much. For slaprunner SR, slapos.core can also be listed explicitly to [eggs].

  • because both sections generate the same scripts with different sys.path.

    I also saw that slaprunner SR was generating same scripts twice. It seems wrong. It can also cause problem when updating software release "in place" like testnode does.

    About @jerome suggestion to do dependent-scripts = true, it may sometimes be too much. For slaprunner SR, slapos.core can also be listed explicitly to [eggs].

    The approach I tried in !253 (closed) seems to add a lot of scripts (I continue this discussion in the MR)

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