Commit 68a1495d authored by Iliya Manolov's avatar Iliya Manolov Committed by Łukasz Nowak

Feature/jupyterlab

JupyterLab is provided side-by-side with Jupyter Classic interface with same process.

Published URL changed:

 * jupyterlab-url provides IPv6 URL to JupterLab interface
 * jupyter-class-url provides IPv6 URL to the classic UI

Thanks to using only one process, the path in the URL differentiates the style of the interface.

Note: This MR replaces closed nexedi/slapos!207

/reviewed-on nexedi/slapos!218
parent 4d66e481
...@@ -39,6 +39,9 @@ eggs = ...@@ -39,6 +39,9 @@ eggs =
${seaborn:egg} ${seaborn:egg}
${statsmodels:egg} ${statsmodels:egg}
patsy patsy
# additional eggs for jupyterlab
jupyterlab
jupyterlab-launcher
interpreter = pythonjupyter interpreter = pythonjupyter
...@@ -69,6 +72,9 @@ scripts = ...@@ -69,6 +72,9 @@ scripts =
jupyter-nbextension jupyter-nbextension
jupyter-notebook jupyter-notebook
jupyter-serverextension jupyter-serverextension
jupyter-lab
jupyter-labextension
jupyter-labhub
initialization = initialization =
# https://github.com/ipython/ipython/issues/5420 # https://github.com/ipython/ipython/issues/5420
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[instance-jupyter-notebook] [instance-jupyter-notebook]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 27bb1bcf71a2f637f539af697ed73445 md5sum = 89ef078efd20c5e03d1cf7228568b865
[jupyter-notebook-config] [jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja filename = jupyter_notebook_config.py.jinja
......
...@@ -59,7 +59,7 @@ key_file = ${directory:etc}/jupyter_cert.key ...@@ -59,7 +59,7 @@ key_file = ${directory:etc}/jupyter_cert.key
[instance] [instance]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = command-line =
{{ bin_directory }}/jupyter-notebook {{ bin_directory }}/jupyter-lab
--no-browser --no-browser
--ip=${instance-parameter:host} --ip=${instance-parameter:host}
--port=${instance-parameter:port} --port=${instance-parameter:port}
...@@ -68,7 +68,7 @@ command-line = ...@@ -68,7 +68,7 @@ command-line =
--keyfile=${instance-parameter:key_file} --keyfile=${instance-parameter:key_file}
--notebook-dir=${instance-parameter:notebook_dir} --notebook-dir=${instance-parameter:notebook_dir}
--log-level="DEBUG" --log-level="DEBUG"
wrapper-path = ${directory:service}/jupyter-notebook wrapper-path = ${directory:service}/jupyter-lab
parameters-extra = true parameters-extra = true
environment = environment =
JUPYTER_PATH=${directory:jupyter_dir} JUPYTER_PATH=${directory:jupyter_dir}
...@@ -126,7 +126,8 @@ instance-configuration = ...@@ -126,7 +126,8 @@ instance-configuration =
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
url = https://[${instance-parameter:host}]:${instance-parameter:port} jupyter-classic-url = https://[${instance-parameter:host}]:${instance-parameter:port}/tree
jupyterlab-url = https://[${instance-parameter:host}]:${instance-parameter:port}/lab
[erp5-kernel] [erp5-kernel]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
......
...@@ -71,6 +71,8 @@ ipython-genutils = 0.1.0 ...@@ -71,6 +71,8 @@ ipython-genutils = 0.1.0
ipywidgets = 6.0.0 ipywidgets = 6.0.0
jupyter-client = 5.0.0 jupyter-client = 5.0.0
jupyter-core = 4.3.0 jupyter-core = 4.3.0
jupyterlab = 0.26.3
jupyterlab-launcher = 0.3.1
matplotlib = 2.0.0 matplotlib = 2.0.0
mistune = 0.7.3 mistune = 0.7.3
nbformat = 4.3.0 nbformat = 4.3.0
......
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