Merge remote-tracking branch 'origin/zope4py2' into zope4py3

component/ZODB/buildout.cfg

@@ -15,10 +15,10 @@ parts = ZODB/scripts
 #   [ZODB]
 #   major = <ZODB-version-major>
 #
-# By default ZODB4 is used.
+# By default ZODB5 is used.
 [ZODB]
 recipe = slapos.recipe.build
-major  = 4
+major  = 5
 init =
   # link/depend ZODB -> ZODB<X>
   zodb_x = 'ZODB'+options['major']
@@ -96,7 +96,7 @@ setup-eggs = ${python-cffi:egg}
 [versions]
 BTrees = 4.5.1
 persistent = 4.6.4
-zodbpickle = 1.0.4
+zodbpickle = 2.0.0
 
 # Provide ZODB3 for those eggs that still care about ZODB3 compatibility -
 # for example wendelin.core. ZODB3 3.11 is just a dependency egg on _latest_

software/neoppod/software.cfg

@@ -34,7 +34,7 @@ interpreter = ${:_buildout_section_name_}
 
 [versions]
 # To match ERP5
-zope.event = 3.5.2
-zope.exceptions = 3.6.2
-zope.testing = 3.9.7
+zope.event = 4.5.0
+zope.exceptions = 4.4
+zope.testing = 4.7
 ##

software/theia/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = f2f01a47d98a980177dc1755e618bbb7
 
 [instance-import]
 _update_hash_filename_ = instance-import.cfg.jinja.in
-md5sum = b0a2c2b3d59fd6c8ba76c634b83a1ba2
+md5sum = 74b9b46769a25add50f9f63365de58ad
 
 [instance-export]
 _update_hash_filename_ = instance-export.cfg.jinja.in

software/theia/instance-import.cfg.jinja.in

@@ -64,15 +64,14 @@ seed = Import {{ root_title }}
 # in post-notification-run:output and in importer:wrapper.
 
 [post-notification-run]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/post-notification-run-script
-output = $${:rendered}
-mode = 0700
-template =
-  inline:#!${software-info:bash}
-  # Do nothing because the backup signature will
-  # be verified by the import script itself
-  exit 0
+# Do nothing because the backup signature will
+# be verified by the import script itself
+recipe = slapos.recipe.build
+output = $${directory:bin}/post-notification-run-script
+location = $${:output}
+install =
+  import os
+  os.symlink("/bin/true", location)
 
 [importer]
 wrapper = $${theia-import-script:rendered}

stack/erp5/buildout.cfg

@@ -59,7 +59,7 @@ extends =
   ../../component/wendelin.core/buildout.cfg
   ../../component/jupyter-py2/buildout.cfg
   ../../stack/caucase/buildout.cfg
-  ../../software/neoppod/software-zodb5.cfg
+  ../../software/neoppod/software-common.cfg
 # keep neoppod extends last
 
 parts +=
@@ -600,6 +600,7 @@ scripts =
   tidstoraged
   tidstorage_repozo
   wcfs
+  web_checker_utility
 
 extra-paths =
   ${erp5:location}
@@ -616,10 +617,6 @@ python-magic-patch-options = -p1
 Zope-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/0001-OFS-XMLExportImport.patch#12a9b9db76b3cd9035b6032d516143e0
 Zope-patch-options = -p1
 
-[template-neo]
-recipe =
-template =
-
 [eggs-all-scripts]
 recipe = zc.recipe.egg
 eggs =

stack/erp5/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = c4bb59e56a29c4aaf5b2c2b92520e8f7
+md5sum = fb02a30a9af9ef9a4724048c548b6542
 
 [site-zcml]
 filename = site.zcml
@@ -70,11 +70,11 @@ md5sum = 274365ebbade26558ca4836837e781aa
 
 [template]
 filename = instance.cfg.in
-md5sum = 8bfc1cf5e94fa57cc86990426f8ea195
+md5sum = ed280a76c22247cf2a05fac29b8a8b30
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 58e5684e460eddb247220ce6805653e6
+md5sum = f5a1661449c9681b3de7d4af645124ba
 
 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -90,7 +90,7 @@ md5sum = 9c7bf69e24bc8964f3854a0bd3eebf2c
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 3947cd1b0d2f26c6f7872125d8aa5544
+md5sum = e0567c8d7717d1ed5daf4555566c76cd
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -120,7 +120,6 @@ update-command = ${:command}
 {% set haproxy_dict = {} -%}
 {% set zope_virtualhost_monster_backend_dict = {} %}
 {% set test_runner_url_dict = {} %} {# family_name => list of URLs #}
-{% import "functools" as functools %}
 {% set next_port = functools.partial(next, itertools.count(slapparameter_dict['tcpv4-port'])) -%}
 {% for family_name, parameter_id_list in sorted(
   six.iteritems(slapparameter_dict['zope-family-dict'])) -%}

stack/erp5/instance.cfg.in

@@ -80,6 +80,7 @@ extra-context =
     section parameter_dict dynamic-template-balancer-parameters
     import itertools itertools
     import hashlib hashlib
+    import functools functools
 import-list =
     file caucase context:caucase-jinja2-library
 

stack/erp5/zope-versions.cfg

-[buildout]
-# Version pins for required and commonly used dependencies.
-
 [versions]
 #Zope = 4.5.3
 Zope2 = 4.0

stack/slapos.cfg

@@ -197,7 +197,7 @@ slapos.libnetworkcache = 0.22
 slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.53
 slapos.recipe.cmmi = 0.19
-slapos.recipe.template = 4.6
+slapos.recipe.template = 5.0
 slapos.toolbox = 0.126
 stevedore = 1.21.0:whl
 subprocess32 = 3.5.4
@@ -209,7 +209,7 @@ zc.lockfile = 1.0.2
 zdaemon = 4.2.0
 zipp = 1.2.0:whl
 zodburi = 2.5.0
-zope.event = 3.5.2
+zope.event = 4.5.0
 paramiko = 2.1.3
 CacheControl = 0.12.6:whl
 msgpack = 0.6.2
@@ -244,7 +244,7 @@ rpdb = 0.1.5
 supervisor = 4.1.0
 tzlocal = 1.5.1
 uritemplate = 3.0.0
-zope.interface = 4.3.3
+zope.interface = 5.2.0
 certifi = 2020.6.20
 chardet = 3.0.4
 urllib3 = 1.25.9