Merge remote-tracking branch 'origin/master' into zope4py2

component/theia/buildout.cfg

@@ -5,6 +5,7 @@ extends =
   ../pkgconfig/buildout.cfg
   ../patchelf/buildout.cfg
   ../python3/buildout.cfg
+  ../tar/buildout.cfg
   ../yarn/buildout.cfg
   download-plugins.cfg
   buildout.hash.cfg
@@ -20,6 +21,13 @@ recipe = slapos.recipe.build:download
 shared = true
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
 
+[vscode-uri]
+recipe = slapos.recipe.build:download
+shared = true
+revision = c45342deb98de5c7b391bd2c08431b536b869a04
+url = https://github.com/xavth/vscode-uri/archive/${:revision}.tar.gz
+md5sum = 877accd4e29d2293ce33815803d998cc
+
 [theia]
 recipe = slapos.recipe.cmmi
 shared = true
@@ -36,6 +44,19 @@ pre-configure =
   echo '${package.json:content}' > %(location)s/package.json
   # To regenerate yarn.lock, comment the line below
   cp yarn.lock %(location)s
+  # Workaround https://github.com/microsoft/vscode/issues/154048
+  # Once upstream is fixed:
+  # - remove [vscode-uri] section
+  # - remove the commands below
+  # - remove component/tar/buildout.cfg
+  # - remove the "resolution" field in package.json
+  # - regenerate yarn.lock
+  cd %(location)s
+  ${tar:location}/bin/tar -xzf ${vscode-uri:target}
+  mv vscode-uri-${vscode-uri:revision} vscode-uri
+  cd vscode-uri
+  ${yarn:location}/bin/yarn
+  ${yarn:location}/bin/yarn install
 configure-command = true
 make-binary = cd %(location)s && ${yarn:location}/bin/yarn
 make-targets = theia build
@@ -172,6 +193,9 @@ content =
           "@perrinjerome/theia-open": "latest",
           "@perrinjerome/theia-open-cli": "latest"
       },
+      "resolutions": {
+          "**/vscode-uri": "file:./vscode-uri"
+      },
       "devDependencies": {
           "@theia/cli": "latest"
       }

component/theia/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 8157c22134200bd862a07c6521ebf799
 
 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = a1b9ecda50ca67300282f20724180f60
+md5sum = db6372aa3895f1d4359c97f47993cd33
 
 [ms-python-disable-jedi-buildout.patch]
 _update_hash_filename_ = ms-python-disable-jedi-buildout.patch

component/trafficserver/buildout.cfg

@@ -24,8 +24,8 @@ min_version = 8
 
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = https://dlcdn.apache.org/trafficserver/trafficserver-9.1.2.tar.bz2
-md5sum = 4dbe434e6cc2bd6ab9a0bf48af312f4b
+url = https://dlcdn.apache.org/trafficserver/trafficserver-9.1.3.tar.bz2
+md5sum = 020e09019d38704a2cf96f4ae8450709
 shared = true
 patch-options = -p1
 configure-options =

stack/erp5/buildout.cfg

@@ -149,7 +149,6 @@ link-binary =
 [template-run-zelenium]
 < = download-base
 
-
 [template]
 recipe = slapos.recipe.template:jinja2
 # XXX: "template.cfg" is hardcoded in instanciation recipe
@@ -229,6 +228,11 @@ context =
     key unixodbc_location unixodbc:location
     key wget_location wget:location
     key extra_path_list eggs:extra-paths
+    key python_executable_for_kernel erp5-python-interpreter-jupyter:interpreter_path
+    key erp5_kernel_location erp5-kernel:location
+    key erp5_kernel_filename erp5-kernel:filename
+    key kernel_json_location kernel-json:location
+    key kernel_json_filename kernel-json:filename
 
 [template-erp5]
 <= download-base
@@ -393,6 +397,18 @@ initialization =
 eggs += ${eggs:eggs}
 extra-paths += ${eggs:extra-paths}
 
+[erp5-python-interpreter-jupyter]
+<= erp5-python-interpreter
+interpreter = pythonwitheggs_jupyter
+interpreter_path = ${buildout:directory}/bin/${:interpreter}
+eggs +=
+  jupyter_client
+  jupyter_core
+  ipython_genutils
+  ipykernel
+  ipywidgets
+  requests
+
 [zope-product-with-eggtestinfo]
 recipe = zc.recipe.egg:custom
 setup-eggs =

stack/erp5/buildout.hash.cfg

@@ -70,7 +70,7 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
 
 [template]
 filename = instance.cfg.in
-md5sum = 9a7f7888ba4183c9d900e862074f3baf
+md5sum = 5747c487edd721d8a53061392307b55f
 
 [template-erp5]
 filename = instance-erp5.cfg.in
@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = e14d77686a11d38c7a597403a2308280
+md5sum = a7e911ae01f78adf5a6634a15b9af569
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-zope.cfg.in

@@ -53,6 +53,22 @@ partition. No more (undefined result), no less (IndexError).
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 
+[erp5-kernel]
+recipe = slapos.cookbook:symbolic.link
+link-binary = {{ parameter_dict['erp5-kernel-location'] }}/{{ parameter_dict['erp5-kernel-filename'] }}
+target-directory = ${directory:erp5-kernel-dir}
+
+[kernel-json-dir]
+<= jinja2-template-base
+template = {{ parameter_dict['kernel-json-location'] }}/{{ parameter_dict['kernel-json-filename'] }}
+rendered = ${directory:erp5-kernel-dir}/kernel.json
+context =
+  raw erp5_url {{ ipv4 }}
+  raw python_executable {{ parameter_dict['python-executable-for-kernel'] }}
+  raw kernel_dir ${erp5-kernel:target-directory}/{{ parameter_dict['erp5-kernel-filename'] }}
+  raw display_name ERP5
+  raw language_name python
+
 [run-common]
 <= userhosts-wrapper-base
 environment-extra =
@@ -66,6 +82,9 @@ environment +=
   INSTANCE_HOME=${:instance-home}
   CAUCASE={{ slapparameter_dict['caucase-url'] }}
   FONTCONFIG_FILE=${fontconfig-conf:output}
+  JUPYTER_PATH=${directory:jupyter-dir}
+  JUPYTER_CONFIG_DIR=${directory:jupyter-config-dir}
+  JUPYTER_RUNTIME_DIR=${directory:jupyter-runtime-dir}
 {% if slapparameter_dict.get('wendelin-core-zblk-fmt') %}
   WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict['wendelin-core-zblk-fmt'] }}
 {% endif %}
@@ -103,6 +122,11 @@ var = ${buildout:directory}/var
 plugin = ${:etc}/plugin
 unit-test-path = ${:srv}/test-instance/unit_test
 fontconfig-cache = ${buildout:directory}/.fontconfig
+jupyter-dir = ${buildout:directory}/jupyter
+jupyter-config-dir = ${:jupyter-dir}/etc
+jupyter-runtime-dir = ${:jupyter-dir}/runtime
+jupyter-kernel-dir = ${:jupyter-dir}/kernels
+erp5-kernel-dir = ${:jupyter-kernel-dir}/ERP5
 
 [fontconfig-conf]
 recipe = slapos.recipe.template:jinja2
@@ -575,3 +599,5 @@ extends =
 parts +=
   {{ '\n  '.join(part_list) }}
   publish
+  erp5-kernel
+  kernel-json-dir

stack/erp5/instance.cfg.in

@@ -114,6 +114,11 @@ extra-path-list = {{ dumps(extra_path_list) }}
 matplotlibrc = {{ matplotlibrc_location }}
 erp5-location = {{ erp5_location }}
 egg-interpreter = {{egg_interpreter}}
+erp5-kernel-location = {{ erp5_kernel_location }}
+erp5-kernel-filename = {{ erp5_kernel_filename }}
+kernel-json-location = {{ kernel_json_location }}
+kernel-json-filename = {{ kernel_json_filename }}
+python-executable-for-kernel = {{ python_executable_for_kernel }}
 
 [dynamic-template-zope]
 <= jinja2-template-base