ERP5: Use jupyter instead of ipython notebook

software/wendelin/software.cfg

@@ -11,7 +11,7 @@ parts +=
   msgpack-python
   ipython
   wendelin.core
-  ipython-notebook
+  jupyter
   wendelin_test_suite_runner
   wendelin_testrunner
 

stack/erp5/buildout.cfg

@@ -61,8 +61,8 @@ extends =
   ../../component/userhosts/buildout.cfg
   ../../component/postfix/buildout.cfg
   ../monitor/buildout.cfg
-  ../../software/ipython_notebook/software.cfg
   ../../software/caucase/software.cfg
+  ../../software/jupyter/software.cfg
   ../../software/neoppod/software-common.cfg
 # keep neoppod extends last
 
@@ -139,15 +139,15 @@ parts +=
   template
 
 # jupyter
-  ipython-notebook
-  instance-jupyter
+  jupyter
+  instance-jupyter-notebook
 
 # override python2.7 to add SlapOS libstdc++ in RPATH.
 [python2.7]
 extra-ldflags = -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64
 
-# override instance-jupyter not to render into default template.cfg
-[instance-jupyter]
+# override instance-jupyter-notebook not to render into default template.cfg
+[instance-jupyter-notebook]
 rendered = ${buildout:directory}/template-jupyter.cfg
 
 [instance-caucase]
@@ -297,7 +297,7 @@ context =
     key template_create_erp5_site_real template-create-erp5-site-real:target
     key template_erp5 template-erp5:target
     key template_haproxy_cfg template-haproxy-cfg:target
-    key template_jupyter_cfg instance-jupyter:rendered
+    key template_jupyter_cfg instance-jupyter-notebook:rendered
     key template_kumofs template-kumofs:target
     key template_mariadb template-mariadb:target
     key template_mariadb_initial_setup template-mariadb-initial-setup:target