Commit 456efbc0 authored by Sebastian's avatar Sebastian

small adjustments to renderjs-extension recipe

parent 4bb22168
...@@ -14,24 +14,6 @@ eggs-directory = {{ eggs_directory }} ...@@ -14,24 +14,6 @@ eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
[renderjs-symlink-nbextension]
recipe = cns.recipe.symlink
#symlink = {{ renderjs_extension_location }}/renderjs_nbextension/renderjs_nbextension = ${directory:jupyter_data_dir}
#symlink = /srv/slapgrid/slappart10/srv/runner/link_from = /srv/slapgrid/slappart10/srv/runner/instance/slappart0/link_to
#symlink = /srv/slapgrid/slappart10/srv/runner/link_from = ${directory:jupyter_nbext_dir}/renderjs-nbextension
symlink = {{ renderjs_extension_location }}/renderjs_nbextension/renderjs_nbextension = ${directory:jupyter_nbext_dir}/renderjs-nbextension
autocreate = true
[renderjs-symlink-nbconfig]
recipe = cns.recipe.symlink
symlink = {{ renderjs_extension_location }}/renderjs_nbextension/renderjs_nbextension/notebook.json = ${directory:jupyter_nbconfig_dir}/notebook.json
autocreate = true
[renderjs-symlink-ipyextension]
recipe = cns.recipe.symlink
symlink = {{ renderjs_extension_location }}/renderjs_ipyextension/renderjs_ipyextension/renderjs_extension.py = ${directory:ipython_extension_dir}/renderjs_extension.py
autocreate = true
[slapconfiguration] [slapconfiguration]
recipe = slapos.cookbook:slapconfiguration.serialised recipe = slapos.cookbook:slapconfiguration.serialised
computer = ${slap-connection:computer-id} computer = ${slap-connection:computer-id}
...@@ -90,7 +72,11 @@ command-line = ...@@ -90,7 +72,11 @@ command-line =
wrapper-path = ${directory:service}/ipython_notebook wrapper-path = ${directory:service}/ipython_notebook
parameters-extra = true parameters-extra = true
# Explicitly define IPython Directory to be used while starting ipython notebook # Explicitly define IPython Directory to be used while starting ipython notebook
environment = IPYTHONDIR=${directory:ipython_dir} environment =
IPYTHONDIR=${directory:ipython_dir}
JUPYTER_CONFIG_DIR=${directory:jupyter_config_dir}
JUPYTER_DATA_DIR=${directory:jupyter_data_dir}
[ipython-notebook-config] [ipython-notebook-config]
<= dynamic-jinja2-template-base <= dynamic-jinja2-template-base
...@@ -152,3 +138,18 @@ template = {{ custom_js_location }}/{{ custom_js_filename }} ...@@ -152,3 +138,18 @@ template = {{ custom_js_location }}/{{ custom_js_filename }}
rendered = ${directory:ipython_dir}/profile_default/static/custom/custom.js rendered = ${directory:ipython_dir}/profile_default/static/custom/custom.js
mode = 0744 mode = 0744
[renderjs-symlink-nbextension]
recipe = cns.recipe.symlink
symlink = {{ renderjs_extension_location }}/renderjs_nbextension/renderjs_nbextension = ${directory:jupyter_nbext_dir}/renderjs_nbextension
autocreate = true
[renderjs-symlink-nbconfig]
recipe = cns.recipe.symlink
symlink = {{ renderjs_extension_location }}/renderjs_nbextension/renderjs_nbextension/notebook.json = ${directory:jupyter_nbconfig_dir}/notebook.json
autocreate = true
[renderjs-symlink-ipyextension]
recipe = cns.recipe.symlink
symlink = {{ renderjs_extension_location }}/renderjs_ipyextension/renderjs_ipyextension/renderjs_extension.py = ${directory:ipython_extension_dir}/renderjs_extension.py
autocreate = true
...@@ -15,13 +15,6 @@ parts = ...@@ -15,13 +15,6 @@ parts =
instance-jupyter instance-jupyter
renderjs-extension renderjs-extension
[renderjs-extension]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
repository = https://lab.nexedi.com/Kreisel/renderjs_extension.git
branch = master
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[ipython-notebook] [ipython-notebook]
; In the ipython notebook software, we use more eggs than in the minimal ; In the ipython notebook software, we use more eggs than in the minimal
; ipython notebook component ; ipython notebook component
...@@ -69,12 +62,19 @@ md5sum = ab6e78ea20855e07d388b5b86d1770fe ...@@ -69,12 +62,19 @@ md5sum = ab6e78ea20855e07d388b5b86d1770fe
filename = custom.js.jinja filename = custom.js.jinja
md5sum = a851a68667a4e676cfa86b34a86b4239 md5sum = a851a68667a4e676cfa86b34a86b4239
[renderjs-extension]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
repository = https://lab.nexedi.com/Kreisel/renderjs_extension.git
branch = master
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[instance-jupyter] [instance-jupyter]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/template.cfg rendered = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
md5sum = b8feb9e154407243b920b2bcdd2242a9 md5sum = 8936de7544e902641fb33c609c6d4e50
context = context =
key bin_directory buildout:bin-directory key bin_directory buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
......
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