stack/slapos.cfg: Unify version pins for slapos.recipe.template

See merge request nexedi/slapos!887

component/cythonplus/buildout.cfg

@@ -54,6 +54,5 @@ context =
   import easy_install zc.buildout.easy_install
 
 [versions]
-slapos.recipe.template = 4.4
 coverage = 4.5.1
 pycodestyle = 2.5.0

component/jupyter-py2/buildout.cfg

@@ -89,7 +89,6 @@ pyzmq = 16.0.2
 scikit-learn = 0.18.1
 seaborn = 0.7.1
 simplegeneric = 0.8.1
-slapos.recipe.template = 4.4
 statsmodels = 0.8.0
 terminado = 0.6
 tornado = 4.4.2

software/agent/software.cfg

@@ -48,5 +48,4 @@ gitdb = 0.6.4
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.download = 1.0
-slapos.recipe.template = 4.4
 smmap = 0.9.0

software/ajaxplorer/software.cfg

@@ -84,5 +84,4 @@ numpy = 1.16.4
 # websockify 0.4.1 doesn't install well
 websockify = 0.3.0
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.4.2
 z3c.recipe.mkdir = 0.5

software/backupserver/software.cfg

@@ -105,5 +105,4 @@ mode = 0644
 rdiff-backup = 1.0.5+SlapOSPatched001
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.4.3
 PyRSS2Gen = 1.1

software/build-rina/software.cfg

@@ -82,6 +82,3 @@ packages +=
   dh-autoreconf pkg-config doxygen maven xmlto
 # hellorina (shouldn't parts like lxml-python depend on the python of the SR?)
   python-dev
-
-[versions]
-slapos.recipe.template = 4.4

software/buildout-testing/software.cfg

@@ -59,6 +59,3 @@ template =
     key slapos_buildout slapos.buildout-repository:location
     key temp_directory directory:tmp
     raw runTestSuite_py ${buildout:bin-directory}/${runTestSuite_py:interpreter}
-
-[versions]
-slapos.recipe.template = 4.4

software/caddy-frontend/software.cfg

@@ -246,7 +246,6 @@ gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 4.4
 smmap = 0.9.0
 
 websockify = 0.8.0

software/caucase/software.cfg

@@ -24,6 +24,3 @@ context =
   key eggs_directory buildout:eggs-directory
   key caucase_jinja2_library caucase-jinja2-library:target
   key instance_caucased instance-caucased:target
-
-[versions]
-slapos.recipe.template = 3.0

software/cdn-me/software.cfg

@@ -39,4 +39,3 @@ eggs =
 cns.recipe.symlink = 0.2.3
 collective.recipe.environment = 0.2.0
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.4

software/cythonplus-dev/software.cfg

@@ -21,6 +21,3 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
 recipe = zc.recipe.egg
 eggs = erp5.util
 interpreter = ${:_buildout_section_name_}
-
-[versions]
-slapos.recipe.template = 4.4

software/davstorage/development.cfg

@@ -34,4 +34,3 @@ command =
 
 [versions]
 openssl = 1.0.1c
-slapos.recipe.template = 2.4.2

software/davstorage/software.cfg

@@ -34,4 +34,3 @@ command =
 
 [versions]
 openssl = 1.0.1c
-slapos.recipe.template = 2.4.2

software/dream/software.cfg

@@ -49,7 +49,6 @@ mysqlclient = 1.3.12
 # indirect dependancies
 cp.recipe.cmd = 0.5
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.4
 zope.exceptions = 4.0.7
 zope.testing = 4.1.3
 zc.recipe.testrunner = 2.0.0

software/erp5testnode/software.cfg

@@ -42,7 +42,6 @@ output = ${buildout:directory}/template-default.cfg
 mode = 0644
 
 [versions]
-slapos.recipe.template = 4.4
 dnspython = 1.15.0
 PyXML = 0.8.5
 WebOb = 1.8.5

software/erp5testnode/testsuite/dummy/software.cfg

@@ -13,6 +13,3 @@ url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 md5sum = 9fccb9600a085691ab0f9a20cd615c01
 mode = 0644
-
-[versions]
-slapos.recipe.template = 4.4

software/fluentd/software.cfg

@@ -21,6 +21,3 @@ context =
 gems +=
   fluent-plugin-wendelin==0.4
   fluent-plugin-bin
-
-[versions]
-slapos.recipe.template = 4.4

software/galene/software.cfg

@@ -43,6 +43,3 @@ environment =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/instance.cfg
-
-[versions]
-slapos.recipe.template = 4.4

software/gitlab/software.cfg

@@ -405,5 +405,4 @@ strip-top-level-dir = true
 cns.recipe.symlink = 0.2.3
 docutils = 0.12
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.3
 z3c.recipe.scripts = 1.0.1

software/grafana/software.cfg

@@ -157,5 +157,4 @@ curl-bin = ${curl:location}/bin/curl
 dash-bin = ${dash:location}/bin/dash
 
 [versions]
-slapos.recipe.template = 4.2
 inotifyx = 0.2.2

software/hellorina/software.cfg

@@ -40,6 +40,3 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
 mode = 755
 md5sum = 78b77a6bda9958f547f7d89b747731e3
-
-[versions]
-slapos.recipe.template = 4.4

software/helloworld/software.cfg

@@ -53,7 +53,3 @@ context =
   raw template_monitor ${monitor2-template:rendered}
 # md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
 # calling update-hash
-
-# Pin versions of eggs used that are not already pinned by stack/slapos.cfg
-[versions]
-slapos.recipe.template = 4.4

software/html5as/software.cfg

@@ -71,6 +71,5 @@ async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 4.4
 smmap = 0.8.2
 plone.recipe.command = 1.1

software/html5ide/software.cfg

@@ -47,4 +47,3 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.4

software/htmlvalidatorserver/software.cfg

@@ -50,5 +50,4 @@ mode = 0644
 # but '1.3.4nxd2-SlapOSPatched001'.
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.4.3
 inotifyx = 0.2.2

software/jstestnode/software.cfg

@@ -118,7 +118,6 @@ output = ${buildout:directory}/runTestSuite.in
 
 [versions]
 
-slapos.recipe.template = 4.4
 selenium = 3.14.1
 urllib3 = 1.24
 certifi = 2018.10.15

software/jupyter/software.cfg

@@ -104,7 +104,6 @@ pyzmq = 20.0.0
 scikit-learn = 0.20.4
 seaborn = 0.7.1
 simplegeneric = 0.8.1
-slapos.recipe.template = 4.4
 statsmodels = 0.11.1
 testpath = 0.4.4
 terminado = 0.9.1

software/kvm/software.cfg

@@ -205,5 +205,4 @@ websockify = 0.9.0
 collective.recipe.environment = 0.2.0
 gitdb = 0.6.4
 pycurl = 7.43.0
-slapos.recipe.template = 4.4
 smmap = 0.9.0

software/metabase/software.cfg

@@ -24,6 +24,3 @@ md5sum = 0a5e780dcf7d9ffe73f1ed789f863a57
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/instance.cfg
-
-[versions]
-slapos.recipe.template = 4.4

software/monitor/software.cfg

@@ -76,7 +76,6 @@ eggs +=
 scripts =
 
 [versions]
-slapos.recipe.template = 4.4
 
 surykatka = 0.5.0
 

software/mysql-5.1/software.cfg

@@ -45,4 +45,3 @@ mode = 0644
 
 [versions]
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 2.2

software/nayuos/software.cfg

@@ -67,6 +67,3 @@ dependencies =
   libexpat
   libaio
   boost-lib
-
-[versions]
-slapos.recipe.template = 4.4

software/neoppod/software-common.cfg

@@ -146,7 +146,6 @@ persistent = 4.6.4
 pycrypto = 2.6.1
 pycurl = 7.43.0
 setproctitle = 1.1.10
-slapos.recipe.template = 4.4
 transaction = 1.7.0
 zodbpickle = 1.0.4
 cython-zstd = 0.2

software/neoppod/stress-testing/software.cfg

@@ -84,6 +84,3 @@ packages +=
   libnetfilter-queue-dev nftables
 # extra requirements for this SR
   screen xz-utils
-
-[versions]
-slapos.recipe.template = 4.4

software/nginx-push-stream/software.cfg

@@ -42,5 +42,4 @@ output = ${buildout:directory}/instance-nginx.cfg.in
 mode = 0644
 
 [versions]
-slapos.recipe.template = 4.4
 inotifyx = 0.2.2

software/plantuml/software.cfg

@@ -32,7 +32,3 @@ output = ${buildout:directory}/${:_buildout_section_name_}
 recipe = slapos.recipe.build:download
 url = https://sourceforge.net/projects/plantuml/files/1.2020.15/plantuml.1.2020.15.war
 md5sum = ed203cb3b90df8f77492fa36ea6490a5
-
-
-[versions]
-slapos.recipe.template = 4.4

software/postgres/software.cfg

@@ -19,6 +19,3 @@ url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 md5sum = d8b833a2054b82b6031a9420008b58fd
 mode = 0644
-
-[versions]
-slapos.recipe.template = 2.4.2

software/powerdns/software.cfg

@@ -54,7 +54,6 @@ mode = 0644
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.4
 passlib = 1.7.1
 GitPython = 2.1.11
 lockfile = 0.12.2

software/proftpd/software.cfg

@@ -46,5 +46,4 @@ context =
 [versions]
 collective.recipe.environment = 1.1.0
 collective.recipe.grp = 1.1.0
-slapos.recipe.template = 4.4
 plone.recipe.command = 1.1

software/pureftpd/software.cfg

@@ -34,7 +34,3 @@ context =
   raw pureftpd_bin ${pure-ftpd:location}/sbin/pure-ftpd
   raw pureuploadscript_bin ${pure-ftpd:location}/sbin/pure-uploadscript
   raw purepw_bin ${pure-ftpd:location}/bin/pure-pw
-
-
-[versions]
-slapos.recipe.template = 4.4

software/re6stnet/software.cfg

@@ -72,7 +72,6 @@ context =
 
 [versions]
 re6stnet = 0.551
-slapos.recipe.template = 4.4
 
 # Required by:
 # re6stnet==0.533

software/redis-server/software.cfg

@@ -26,4 +26,3 @@ mode = 0644
 
 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.4.2

software/repman/software.cfg

@@ -149,7 +149,3 @@ link-binary =
 
 [proxy-need-start-stop.sh.in]
 <= download-file
-
-# Pin versions of eggs used that are not already pinned by stack/slapos.cfg
-[versions]
-slapos.recipe.template = 4.4

software/seleniumrunner/software.cfg

@@ -56,4 +56,3 @@ output = ${buildout:directory}/template.cfg
 
 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.4

software/seleniumserver/software.cfg

@@ -75,4 +75,3 @@ post-install =
 
 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.4

software/slapos-in-partition/software.cfg

@@ -11,4 +11,3 @@ extends = common.cfg
 Pygments = 1.6
 collective.recipe.environment = 0.2.0
 collective.recipe.template = 1.10
-slapos.recipe.template = 4.4

software/slapos-sr-testing/software.cfg

@@ -294,7 +294,6 @@ plantuml = 0.3.0
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
 selenium = 3.141.0
-slapos.recipe.template = 4.4
 
 # Patched eggs
 PyPDF2 = 1.26.0+SlapOSPatched001

software/slaprunner/software.cfg

@@ -176,7 +176,6 @@ gitdb = 0.6.4
 gunicorn = 19.10.0
 prettytable = 0.7.2
 pycurl = 7.43.0
-slapos.recipe.template = 4.4
 collective.recipe.environment = 0.2.0
 smmap = 0.9.0
 lockfile = 0.12.2

software/srslte/software.cfg

@@ -73,5 +73,4 @@ url     = ${:_profile_base_location_}/config/${:filename}
 filename = user_db.csv
 
 [versions]
-slapos.recipe.template = 4.4
 apache-libcloud = 2.4.0

software/test-slave-instance-deployment/software.cfg

@@ -59,7 +59,6 @@ eggs = collective.recipe.template
 collective.recipe.template = 1.11
 plone.recipe.command = 1.1
 slapos.recipe.build = 0.28
-slapos.recipe.template = 4.4
 
 # Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
 [buildout]

software/theia/software.cfg

@@ -390,6 +390,3 @@ template =
 [instance]
 <= template-base
 output = ${buildout:directory}/instance.cfg
-
-[versions]
-slapos.recipe.template = 4.5

software/turnserver/software.cfg

@@ -30,6 +30,3 @@ output = ${buildout:directory}/instance.cfg
 
 [template-insecure-turnserver]
 <= download-base
-
-[versions]
-slapos.recipe.template = 4.4

software/varnish/software.cfg

@@ -59,6 +59,3 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-varnish.cfg.in
 md5sum = 0ea12a4ad2d2e3d406476e35b8d3e3fb
 mode = 640
-
-[versions]
-slapos.recipe.template = 4.4

software/zabbix-agent/software.cfg

@@ -17,6 +17,3 @@ url = ${:_profile_base_location_}/instance.cfg
 md5sum = 98a680fe8fddce5dcee455e65c228fde
 output = ${buildout:directory}/template.cfg
 mode = 0644
-
-[versions]
-slapos.recipe.template = 2.4.2

stack/cloudooo.cfg

@@ -78,7 +78,6 @@ WSGIUtils = 0.7.2
 WSGIserver = 1.3
 python-magic = 0.4.18
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 4.4
 
 # Required by:
 # PasteScript== 3.2.0

stack/nxdtest.cfg

@@ -50,7 +50,3 @@ template = ${:_profile_base_location_}/nxdtest/${:filename}
 context =
   section buildout  buildout
   section nxdtest   nxdtest
-
-
-[versions]
-slapos.recipe.template = 4.4

stack/slapos.cfg

@@ -199,6 +199,7 @@ slapos.libnetworkcache = 0.20
 slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.46
 slapos.recipe.cmmi = 0.16
+slapos.recipe.template = 4.5
 slapos.toolbox = 0.112
 stevedore = 1.21.0
 subprocess32 = 3.5.3