From a1e27a227b5c26cdc2ea0d1d56de1ca5b32ba5ba Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 2 Oct 2015 13:44:36 +0200 Subject: [PATCH] use zc.recipe.egg instead of obsolete z3c.recipe.scripts. --- component/slapos/buildout.cfg | 2 +- software/agent/software.cfg | 2 +- software/cdn-me/software.cfg | 2 +- software/dream/software.cfg | 3 +-- software/html5as/software.cfg | 1 - software/kvm/common.cfg | 2 +- software/monitor/software.cfg | 3 +-- software/slaprunner/common.cfg | 2 +- stack/slapos.cfg | 1 - 9 files changed, 7 insertions(+), 11 deletions(-) diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg index a3ba08f80..d750ae534 100644 --- a/component/slapos/buildout.cfg +++ b/component/slapos/buildout.cfg @@ -76,7 +76,7 @@ rpath = ############################################# [slapos] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = ${lxml-python:egg} ${python-cffi:egg} diff --git a/software/agent/software.cfg b/software/agent/software.cfg index a5fe3f2bd..bff41e9ab 100644 --- a/software/agent/software.cfg +++ b/software/agent/software.cfg @@ -54,7 +54,7 @@ md5sum = 7c5c43eb98d5a11961d72fce97a8e67b mode = 0644 [script] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = zc.buildout slapos.core diff --git a/software/cdn-me/software.cfg b/software/cdn-me/software.cfg index fc91b3d94..de5f08350 100644 --- a/software/cdn-me/software.cfg +++ b/software/cdn-me/software.cfg @@ -28,7 +28,7 @@ mode = 0644 branch = request.product [eggs] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = collective.recipe.environment cns.recipe.symlink diff --git a/software/dream/software.cfg b/software/dream/software.cfg index 58f017664..c1a140257 100644 --- a/software/dream/software.cfg +++ b/software/dream/software.cfg @@ -25,7 +25,7 @@ initialization = ${manpy:initialization} [dream_interpreter] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = ${manpy:eggs} interpreter = dream_interpreter initialization = @@ -59,4 +59,3 @@ zope.exceptions = 4.0.7 zope.testing = 4.1.3 zc.recipe.testrunner = 2.0.0 zope.testrunner = 4.4.6 -z3c.recipe.scripts = 1.0.1 diff --git a/software/html5as/software.cfg b/software/html5as/software.cfg index 98c2bf051..f6f06e0b8 100644 --- a/software/html5as/software.cfg +++ b/software/html5as/software.cfg @@ -75,7 +75,6 @@ rdiff-backup = 1.0.5 slapos.recipe.template = 2.4.2 slapos.toolbox = 0.40.4 smmap = 0.8.2 -z3c.recipe.scripts = 1.0.1 plone.recipe.command = 1.1 # Required by: diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg index c634239a5..d96668a66 100644 --- a/software/kvm/common.cfg +++ b/software/kvm/common.cfg @@ -43,7 +43,7 @@ parts = #XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu [eggs] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = ${lxml-python:egg} websockify diff --git a/software/monitor/software.cfg b/software/monitor/software.cfg index 57095f520..3ef9d76e7 100644 --- a/software/monitor/software.cfg +++ b/software/monitor/software.cfg @@ -89,7 +89,7 @@ gems += fluent-plugin-grep==0.3.4 [eggs] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = cns.recipe.symlink slapos.cookbook @@ -102,7 +102,6 @@ PyRSS2Gen = 1.1 cns.recipe.symlink = 0.2.3 plone.recipe.command = 1.1 slapos.recipe.template = 2.7 -z3c.recipe.scripts = 1.0.1 rubygemsrecipe = 0.2.1 pycurl = 7.19.5.1 diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index 8485ec605..4c574de7c 100644 --- a/software/slaprunner/common.cfg +++ b/software/slaprunner/common.cfg @@ -190,7 +190,7 @@ filename = monitor-check-webrunner-internal-instances.py mode = 0644 [eggs] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = collective.recipe.environment cns.recipe.symlink diff --git a/stack/slapos.cfg b/stack/slapos.cfg index 5e1c82737..f9e05efca 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -144,7 +144,6 @@ slapos.recipe.cmmi = 0.2 stevedore = 1.8.0 unicodecsv = 0.14.0 xml-marshaller = 0.9.7 -z3c.recipe.scripts = 1.0.1 # Required by: # slapos.core==1.3.10 -- 2.30.9