Commit 6507df80 authored by Łukasz Nowak's avatar Łukasz Nowak

ERP5: Use jupyter instead of ipython notebook

parent 6cac7e24
...@@ -11,7 +11,7 @@ parts += ...@@ -11,7 +11,7 @@ parts +=
msgpack-python msgpack-python
ipython ipython
wendelin.core wendelin.core
ipython-notebook jupyter
wendelin_test_suite_runner wendelin_test_suite_runner
wendelin_testrunner wendelin_testrunner
......
...@@ -61,8 +61,8 @@ extends = ...@@ -61,8 +61,8 @@ extends =
../../component/userhosts/buildout.cfg ../../component/userhosts/buildout.cfg
../../component/postfix/buildout.cfg ../../component/postfix/buildout.cfg
../monitor/buildout.cfg ../monitor/buildout.cfg
../../software/ipython_notebook/software.cfg
../../software/caucase/software.cfg ../../software/caucase/software.cfg
../../software/jupyter/software.cfg
../../software/neoppod/software-common.cfg ../../software/neoppod/software-common.cfg
# keep neoppod extends last # keep neoppod extends last
...@@ -139,15 +139,15 @@ parts += ...@@ -139,15 +139,15 @@ parts +=
template template
# jupyter # jupyter
ipython-notebook jupyter
instance-jupyter instance-jupyter-notebook
# override python2.7 to add SlapOS libstdc++ in RPATH. # override python2.7 to add SlapOS libstdc++ in RPATH.
[python2.7] [python2.7]
extra-ldflags = -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 extra-ldflags = -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64
# override instance-jupyter not to render into default template.cfg # override instance-jupyter-notebook not to render into default template.cfg
[instance-jupyter] [instance-jupyter-notebook]
rendered = ${buildout:directory}/template-jupyter.cfg rendered = ${buildout:directory}/template-jupyter.cfg
[instance-caucase] [instance-caucase]
...@@ -297,7 +297,7 @@ context = ...@@ -297,7 +297,7 @@ context =
key template_create_erp5_site_real template-create-erp5-site-real:target key template_create_erp5_site_real template-create-erp5-site-real:target
key template_erp5 template-erp5:target key template_erp5 template-erp5:target
key template_haproxy_cfg template-haproxy-cfg: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_kumofs template-kumofs:target
key template_mariadb template-mariadb:target key template_mariadb template-mariadb:target
key template_mariadb_initial_setup template-mariadb-initial-setup:target key template_mariadb_initial_setup template-mariadb-initial-setup:target
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment