Merge remote-tracking branch 'upstream/master' into zope4py2

software/beremiz-ide/software.cfg

@@ -86,9 +86,9 @@ eggs +=
 
 [beremiz]
 recipe = slapos.recipe.build:download-unpacked
-# download beremiz at revision 8171447dc479012a58fae0f2ffd233ade7d28d6a
-url = https://github.com/beremiz/beremiz/archive/8171447dc479012a58fae0f2ffd233ade7d28d6a.tar.gz
-md5sum = 48070804b00b633d79dfc4bae3a73646
+# download beremiz at revision c9b7db300a25806ccaa9d5a844d1e0fd281acb4b
+url = https://github.com/beremiz/beremiz/archive/c9b7db300a25806ccaa9d5a844d1e0fd281acb4b.tar.gz
+md5sum = ed28b53deaaa9a10e6160b10e9dad1a8
 
 [beremiz-setup]
 recipe  = zc.recipe.egg:develop

software/beremiz-runtime/software.cfg

@@ -3,6 +3,7 @@ extends =
   buildout.hash.cfg
   ../../component/git/buildout.cfg
   ../../component/matiec/buildout.cfg
+  ../../component/open62541/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -12,11 +13,20 @@ parts =
   instance-profile
   python-interpreter
   matiec
+  open62541
+
+[open62541]
+# Beremiz need it to be in folder parts/open62541
+# as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
+shared = false
+post-install =
+  mkdir -p @@LOCATION@@/build/bin
+  ln -sf @@LOCATION@@/lib/libopen62541.a @@LOCATION@@/build/bin/libopen62541.a
 
 [beremiz-source]
 recipe = slapos.recipe.build:gitclone
 repository = https://github.com/beremiz/beremiz.git
-revision = 8171447dc479012a58fae0f2ffd233ade7d28d6a
+revision = c9b7db300a25806ccaa9d5a844d1e0fd281acb4b
 git-executable = ${git:location}/bin/git
 
 [beremiz]

software/django-dev/software.cfg

 [buildout]
 extends =
-        ../../stack/slapos.cfg
-        ../../component/macros/virtual-env.cfg
+  ../../stack/slapos.cfg
+  ../../component/macros/virtual-env.cfg
 
 parts =
-        django-env
+  django-env
 
 [django-env]
 <= virtual-env-base
@@ -15,8 +15,6 @@ eggs = Django
 part = python3
 
 [versions]
-Django = 3.2.12
+Django = 4.0.6
 sqlparse = 0.4.2
-pytz = 2021.3
-asgiref = 3.3.2
-typing-extensions = 4.1.1:whl
+asgiref = 3.5.2

stack/erp5/buildout.hash.cfg

@@ -66,7 +66,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
 
 [template-run-zelenium]
 filename = run-zelenium-test.py.in
-md5sum = 38653020296e43f84a93b99cb35aaef6
+md5sum = b95084ae9eed95a68eada45e28ef0c04
 
 [template]
 filename = instance.cfg.in

stack/erp5/run-zelenium-test.py.in

@@ -77,6 +77,23 @@ def main():
       traceback.print_exc()
     time.sleep(600)
 
+  # Unsubscribe activity
+  # Launch Zuite_waitForActivities with activity suscribed may create conflict
+
+  activity_unsubscribe_url = "%s/erp5/portal_activities/unsubscribe" \
+      "?__ac_name=%s" \
+      "&__ac_password=%s" % (parser_configuration['remote-access-url'],  {{ repr(user) }}, {{ repr(password) }})
+  print activity_unsubscribe_url
+  try:
+    response = urlopen(activity_unsubscribe_url)
+    try:
+      if response.code != 200:
+        sys.exit(-1)
+    finally:
+      response.close()
+  except Exception:
+    traceback.print_exc()
+
   tool = taskdistribution.TaskDistributor(portal_url=args.master_url)
   browser = webdriver.Remote(parser_configuration['server-url'] , parser_configuration['desired-capabilities'] )