Minimize diff with master branch.

slapos/recipe/generic_mysql/mysql.py

 from __future__ import print_function
+
 import os
 import subprocess
 import time

stack/erp5/buildout.cfg

@@ -62,7 +62,6 @@ extends =
   ../../software/neoppod/software-zodb5.cfg
 # keep neoppod extends last
 
-
 parts +=
   erp5-util-develop
   slapos-cookbook
@@ -506,6 +505,7 @@ eggs = ${neoppod:eggs}
   typing
   pytracemalloc
   xlrd
+
 # Zope
   ${zope.security:egg}
   ${zope.container:egg}
@@ -525,30 +525,41 @@ eggs = ${neoppod:eggs}
   ${Products.DCWorkflow:egg}
   ${Products.GenericSetup:egg}
   five.localsitemanager
+
 # Other products
   Products.DCWorkflowGraph
   Products.MimetypesRegistry
   Products.ExternalEditor
   Products.TIDStorage
   Products.LongRequestLogger
+
 # BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
 #      (for tests like testCookieCrumbler).
   zope.app.testing
+
 # Currently forked in our repository
 #    Products.PortalTransforms
 # Dependency for our fork of PortalTransforms
   StructuredText
+
 # Needed for parsing .po files from our Localizer subset
   polib
+
 # Needed for Google OAuth
   google-api-python-client
+
 # Need for Facebook OAuth
   facebook-sdk
+
+# Used by ERP5 Jupyter backend
+#  ipykernel
+
 # Used by DiffTool
   xmltodict
   deepdiff
   unidiff
   jsonpickle
+
 # WSGI server
   zope.globalrequest
   waitress
@@ -573,7 +584,7 @@ eggs = ${neoppod:eggs}
   Record
 # StructuredText
   Zope
-  
+
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the
 # installation of python, which we don't want on an instance
@@ -606,7 +617,7 @@ Zope-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/0001-O
 Zope-patch-options = -p1
 
 [template-neo]
-recipe = 
+recipe =
 template =
 
 [eggs-all-scripts]

stack/erp5/zope.conf.in

@@ -81,7 +81,6 @@ trusted-proxy 0.0.0.0
 {%   endif %}
 
 {% endif -%}
-
 {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
 {% if sql_connection_string -%}
 {%   set bt5_repository_url = [] -%}

stack/slapos-dev.cfg

@@ -25,7 +25,6 @@ depends = ${slapos-toolbox-dependencies:eggs}
 
 [slapos.cookbook-repository]
 develop = true
-branch = zope4
 
 # Used for resiliency tests only
 [erp5.util-repository]