From ec1cd866940b51114e4f3d95fdfe0e319d75d5f5 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Tue, 13 Aug 2019 15:34:04 -0300 Subject: [PATCH] erp5.util egg version up (0.4.59) Remove duplicated version definition at software level to prevent excessive duplication of the value. --- software/agent/software.cfg | 1 - software/build-rina/software.cfg | 1 - software/buildout-testing/software.cfg | 1 - software/cdn-me/software.cfg | 1 - software/erp5testnode/software.cfg | 3 +-- software/erp5testnode/testsuite/deploy-test/software.cfg | 3 --- software/jstestnode/software.cfg | 2 +- software/kvm/software.cfg | 1 - software/neoppod/software.cfg | 1 - software/neotest/software.cfg | 1 - software/nginx-push-stream/software.cfg | 1 - software/powerdns/software.cfg | 1 - software/slapos-sr-testing/software.cfg | 3 --- stack/cloudooo.cfg | 4 ---- stack/slapos.cfg | 2 +- 15 files changed, 3 insertions(+), 23 deletions(-) diff --git a/software/agent/software.cfg b/software/agent/software.cfg index 82905f7ae..e8d6c06a7 100644 --- a/software/agent/software.cfg +++ b/software/agent/software.cfg @@ -44,7 +44,6 @@ eggs = [versions] ecdsa = 0.13 -erp5.util = 0.4.51 gitdb = 0.6.4 pycrypto = 2.6.1 pycurl = 7.43.0 diff --git a/software/build-rina/software.cfg b/software/build-rina/software.cfg index 0686af97d..82ec44bde 100644 --- a/software/build-rina/software.cfg +++ b/software/build-rina/software.cfg @@ -84,5 +84,4 @@ packages += python-dev [versions] -erp5.util = 0.4.51 slapos.recipe.template = 4.3 diff --git a/software/buildout-testing/software.cfg b/software/buildout-testing/software.cfg index 57c8e8edb..b8a4d13a6 100644 --- a/software/buildout-testing/software.cfg +++ b/software/buildout-testing/software.cfg @@ -59,5 +59,4 @@ template = raw runTestSuite_py ${buildout:bin-directory}/${runTestSuite_py:interpreter} [versions] -erp5.util = 0.4.51 slapos.recipe.template = 4.3 diff --git a/software/cdn-me/software.cfg b/software/cdn-me/software.cfg index 8fea6f420..4bea18ecc 100644 --- a/software/cdn-me/software.cfg +++ b/software/cdn-me/software.cfg @@ -38,6 +38,5 @@ eggs = [versions] cns.recipe.symlink = 0.2.3 collective.recipe.environment = 0.2.0 -erp5.util = 0.4.51 plone.recipe.command = 1.1 slapos.recipe.template = 4.3 diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index a7c50e865..915bda5f0 100644 --- a/software/erp5testnode/software.cfg +++ b/software/erp5testnode/software.cfg @@ -61,7 +61,6 @@ output = ${buildout:directory}/template-default.cfg mode = 0644 [versions] -erp5.util = 0.4.58 slapos.recipe.template = 4.3 dnspython = 1.15.0 PyXML = 0.8.5 @@ -93,4 +92,4 @@ zope.event = 4.4 # Required by: # zope.testbrowser==5.3.2 -zope.schema = 4.9.3 \ No newline at end of file +zope.schema = 4.9.3 diff --git a/software/erp5testnode/testsuite/deploy-test/software.cfg b/software/erp5testnode/testsuite/deploy-test/software.cfg index 5a76bb272..98f0c3b79 100644 --- a/software/erp5testnode/testsuite/deploy-test/software.cfg +++ b/software/erp5testnode/testsuite/deploy-test/software.cfg @@ -73,6 +73,3 @@ recipe = slapos.recipe.template url = ${:_profile_base_location_}/${:filename} output = ${buildout:directory}/template.cfg mode = 0644 - -[versions] -erp5.util = 0.4.51 diff --git a/software/jstestnode/software.cfg b/software/jstestnode/software.cfg index 2121c09b2..4eb023151 100644 --- a/software/jstestnode/software.cfg +++ b/software/jstestnode/software.cfg @@ -115,7 +115,7 @@ output = ${buildout:directory}/template-nginx.cfg.in output = ${buildout:directory}/runTestSuite.in [versions] -erp5.util = 0.4.51 + slapos.recipe.template = 4.3 selenium = 3.14.1 urllib3 = 1.24 diff --git a/software/kvm/software.cfg b/software/kvm/software.cfg index cc9c77833..5a4176dad 100644 --- a/software/kvm/software.cfg +++ b/software/kvm/software.cfg @@ -200,7 +200,6 @@ context = # XXX - use websockify = 0.5.1 for compatibility with kvm frontend websockify = 0.5.1 -erp5.util = 0.4.51 collective.recipe.environment = 0.2.0 gitdb = 0.6.4 pycurl = 7.43.0 diff --git a/software/neoppod/software.cfg b/software/neoppod/software.cfg index 7dbd29b63..455d3245c 100644 --- a/software/neoppod/software.cfg +++ b/software/neoppod/software.cfg @@ -35,7 +35,6 @@ eggs = erp5.util interpreter = ${:_buildout_section_name_} [versions] -erp5.util = 0.4.51 # To match ERP5 ZConfig = 2.9.3 zc.lockfile = 1.0.2 diff --git a/software/neotest/software.cfg b/software/neotest/software.cfg index 80e882467..e2b9b19c8 100644 --- a/software/neotest/software.cfg +++ b/software/neotest/software.cfg @@ -124,7 +124,6 @@ ZODB3 = 3.11.0 numpy = 1.16.4 zope.testing = 4.6.2 pygolang = 0.0.0.dev4 -erp5.util = 0.4.51 # Required by: # ZEO==4.3.1 diff --git a/software/nginx-push-stream/software.cfg b/software/nginx-push-stream/software.cfg index 76b6d1b9f..f7853f9f3 100644 --- a/software/nginx-push-stream/software.cfg +++ b/software/nginx-push-stream/software.cfg @@ -46,7 +46,6 @@ mode = 0644 [versions] slapos.recipe.template = 4.3 -erp5.util = 0.4.51 inotifyx = 0.2.2 gitdb2 = 2.0.3 smmap2 = 2.0.3 diff --git a/software/powerdns/software.cfg b/software/powerdns/software.cfg index 4255f110f..da6e7be53 100644 --- a/software/powerdns/software.cfg +++ b/software/powerdns/software.cfg @@ -67,7 +67,6 @@ cns.recipe.symlink = 0.2.3 plone.recipe.command = 1.1 slapos.recipe.template = 4.3 dnspython = 1.15.0 -erp5.util = 0.4.53 passlib = 1.7.1 GitPython = 2.1.11 lockfile = 0.12.2 diff --git a/software/slapos-sr-testing/software.cfg b/software/slapos-sr-testing/software.cfg index c921928d5..63e656440 100644 --- a/software/slapos-sr-testing/software.cfg +++ b/software/slapos-sr-testing/software.cfg @@ -142,9 +142,6 @@ output = ${buildout:directory}/template.cfg mode = 640 [versions] -# Recent erp5.util is needed -erp5.util = 0.4.58 - # Various needed versions Pillow = 5.3.0 PyNaCl = 1.3.0 diff --git a/stack/cloudooo.cfg b/stack/cloudooo.cfg index 68d799643..b67f6a7f0 100644 --- a/stack/cloudooo.cfg +++ b/stack/cloudooo.cfg @@ -91,7 +91,3 @@ slapos.recipe.template = 4.3 # PasteScript==2.0 # cloudooo==1.2.5.dev0 PasteDeploy = 1.5.2 - -# Required by: -# cloudooo==1.2.5.dev0 -erp5.util = 0.4.51 diff --git a/stack/slapos.cfg b/stack/slapos.cfg index adc0df756..b3eba3a40 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -195,7 +195,7 @@ enum34 = 1.1.6 # Required by: # slapos.toolbox==0.94 -erp5.util = 0.4.51 +erp5.util = 0.4.59 # Required by: # slapos.toolbox==0.94 -- 2.30.9