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

component/cythonplus/buildout.cfg

@@ -9,9 +9,6 @@ parts = cythonplus_env.sh
 [gcc]
 min_version = 8.4
 
-[python]
-part = python3
-
 # Dependencies for the Cython+ test suite
 [eggs]
 recipe = zc.recipe.egg

software/beremiz-ide/software.cfg

@@ -96,9 +96,9 @@ eggs +=
 
 [beremiz]
 recipe = slapos.recipe.build:download-unpacked
-# download beremiz at revision c9b7db300a25806ccaa9d5a844d1e0fd281acb4b
-url = https://github.com/beremiz/beremiz/archive/5cd7885043d4801279842d0c0632a58986b878f1.tar.gz
-md5sum = bd2647114749c3c3154f2f4bc4274adb
+# download beremiz at revision f703a6206832e14d7545d88428a7c81335a75004
+url = https://github.com/beremiz/beremiz/archive/f703a6206832e14d7545d88428a7c81335a75004.tar.gz
+md5sum = 01e191324837c9365121a31438b0d350
 
 [beremiz-setup]
 recipe  = zc.recipe.egg:develop

software/cythonplus-dev/software.cfg

@@ -8,9 +8,6 @@ parts =
   slapos-cookbook
   instance.cfg
 
-[python]
-part = python2.7
-
 [instance.cfg]
 recipe = slapos.recipe.template
 output = ${buildout:directory}/${:_buildout_section_name_}