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

component/fish-shell/buildout.cfg

@@ -3,13 +3,14 @@
 [buildout]
 parts = fish-shell
 extends =
-  ../cmake/buildout.cfg
-  ../zlib/buildout.cfg
   ../bzip2/buildout.cfg
+  ../cmake/buildout.cfg
+  ../gettext/buildout.cfg
   ../ncurses/buildout.cfg
+  ../pcre2/buildout.cfg
   ../readline/buildout.cfg
-  ../gettext/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg
 
 [fish-shell]
 recipe = slapos.recipe.cmmi
@@ -22,13 +23,15 @@ configure-options =
   -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
   -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
   -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
+  -DFISH_USE_SYSTEM_PCRE2=ON
+  -DSYS_PCRE2_INCLUDE_DIR=${pcre2:location}/include
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
   CMAKE_INCLUDE_PATH=${bzip2:location}/include:${zlib:location}/include:${ncurses:location}/include:${gettext:location}/include:${readline:location}/include
   CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
-  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${pcre2:location}/lib -Wl,-rpath=${pcre2:location}/lib
   PATH=${xz-utils:location}/bin/:%(PATH)s
 
-CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include
-CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib
+CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include -I${pcre2:location}/include
+CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib:${pcre2:location}/lib
 location = @@LOCATION@@

component/pcre2/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+parts =
+  pcre2
+
+[pcre2]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2
+md5sum = a8e9ab2935d428a4807461f183034abe
+configure-command = ${cmake:location}/bin/cmake
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DPCRE2_BUILD_PCRE2_16=ON
+  -DPCRE2_BUILD_PCRE2_32=ON

component/theia/buildout.cfg

@@ -70,6 +70,10 @@ post-install =
   # and anyway not used once the software is installed
   rm -f %(location)s/node_modules/@msgpackr-extract/*/*.node
   rm -rf $HOME/.cache/yarn/
+  # remove "which" command added in $PATH that does not correctly
+  # handle executables thanks to a secondary group of the user.
+  # https://www.npmjs.com/package/which https://www.npmjs.com/package/isexe
+  rm -f %(location)s/node_modules/.bin/which
 
 [theia-wrapper]
 recipe = slapos.recipe.template
@@ -77,7 +81,7 @@ output = ${buildout:bin-directory}/${:_buildout_section_name_}
 inline =
   #!/bin/sh
   cd ${theia:location}
-  exec ${yarn:location}/bin/yarn theia start "$@"
+  exec ${nodejs:location}/bin/node ${theia:location}/node_modules/.bin/theia start "$@"
 
 [theia-open]
 recipe = slapos.recipe.template
@@ -144,6 +148,7 @@ content =
                       "editor.tabSize": 2,
                       "plantuml.server": "https://plantuml.host.vifib.net/svg/",
                       "plantuml.render": "PlantUMLServer",
+                      "python.pythonPath": "${python:executable}",
                       "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }]
                   },
                   "warnOnPotentiallyInsecureHostPattern": false

component/theia/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 6343592161a349bb40e0de16ce67aa51
 
 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = ff5b37cac09580b885e6d269f62cdbad
+md5sum = c28b0fa56592066e7031de696a5d02b3
 
 [ms-python-disable-jedi-buildout.patch]
 _update_hash_filename_ = ms-python-disable-jedi-buildout.patch

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 8a6efc1054b60f3cbd114a9f6097bae5
+md5sum = 3648844f372a96974582e7281c9987dd
 
 [instance]
 _update_hash_filename_ = instance.cfg.in

software/theia/instance-theia.cfg.jinja.in

@@ -11,6 +11,7 @@ theia-environment-parts =
   slapos-repository
   runner-link
   settings.json
+  python-enable-user-pip
 
 theia-parts =
   frontend-instance
@@ -407,7 +408,7 @@ output = $${directory:bin}/$${:_buildout_section_name_}
 inline =
   #!/bin/sh
   export HOME=$${directory:home}
-  export PATH=${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
+  export PATH=${cli-utilities:PATH}:$HOME/.cargo/bin:$HOME/.local/bin:$PATH
   export IPV6_SLAPRUNNER={{ ipv6_random }}
 
 # Theia Backend
@@ -461,8 +462,9 @@ inline =
   {% raw -%}
   #!{{ bash }}
   SHELL=$BASH
-  # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
-  if [ $# = 0 ]; then
+  # when running interactively, or as a login shell, activate slapos configuration
+  # and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
+  if [ $# = 0 ] || [ $# = 1 -a "$1" = -l ]; then
     . {{ activate }}
     unset GIT_EXEC_PATH
     set -- --rcfile {{ bashrc }}
@@ -480,6 +482,9 @@ output = $${directory:etc}/$${:_buildout_section_name_}
 inline =
   # enable bash completion
   . ${bash-completion:location}/etc/profile.d/bash_completion.sh
+  # enable color for ls
+  eval "$(${coreutils:location}/bin/dircolors -b)"
+  alias ls='ls --color=auto'
   # source user's .bashrc
   [ -f ~/.bashrc ] && . ~/.bashrc
 depends =
@@ -492,6 +497,12 @@ command =
   ${buildout:bin-directory}/slapos complete > $${directory:bash-completions}/slapos
   ${buildout:bin-directory}/slapos complete --shell fish > $${directory:fish-completions}/slapos.fish
 
+[python-enable-user-pip]
+# enable pip user installation for python extension
+recipe = plone.recipe.command
+stop-on-error = true
+command =
+  ${python:executable} -m ensurepip --user
 
 # Embedded Instance
 # -----------------
@@ -590,8 +601,6 @@ output = $${directory:bin}/$${:_buildout_section_name_}
 inline =
   #!/bin/sh
   . $${common-environment:output}
-  #XXX find out where the extra nodejs in theia's PATH comes from
-  export PATH=${nodejs:location}/bin/:$PATH
   . $${slapos-standalone-activate:output}
   exec $${slapos-standalone-script:output}
 
@@ -709,7 +718,7 @@ inline =
     },
     "git.terminalAuthentication": false,
     "security.workspace.trust.startupPrompt": "once",
-    "zc-buildout.python.executable": "${python-for-buildout-languageserver:executable}"
+    "zc-buildout.python.executable": "$${buildout:directory}/software_release/bin/${python-for-buildout-languageserver:interpreter}"
   }
 
 [runner-link]

stack/slapos.cfg

@@ -136,8 +136,8 @@ zc.buildout = 2.7.1+slapos019
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 2.0.3+slapos003
 
-aiohttp = 3.8.1:whl
-aiosignal = 1.2.0
+aiohttp = 3.8.3:whl
+aiosignal = 1.3.1:whl
 apache-libcloud = 2.4.0
 argon2-cffi = 20.1.0
 asn1crypto = 1.3.0
@@ -146,7 +146,7 @@ async-generator = 1.10
 async-timeout = 4.0.2
 atomicwrites = 1.4.0
 atomize = 0.2.0
-attrs = 22.1.0
+attrs = 22.2.0
 backcall = 0.2.0
 backports-abc = 0.5
 backports.functools-lru-cache = 1.6.1:whl
@@ -156,6 +156,7 @@ bcrypt = 3.1.4
 bleach = 5.0.1
 CacheControl = 0.12.6:whl
 cachetools = 5.2.0
+cattrs = 22.2.0
 certifi = 2022.12.7
 cffi = 1.15.0
 chardet = 3.0.4
@@ -182,7 +183,7 @@ et-xmlfile = 1.0.1
 exceptiongroup = 1.0.0:whl
 feedparser = 6.0.10
 Flask = 1.1.2
-frozenlist = 1.3.0
+frozenlist = 1.3.3:whl
 funcsigs = 1.0.2
 functools32 = 3.2.3.post2
 gevent = 20.9.0
@@ -192,7 +193,7 @@ GitPython = 3.1.30
 greenlet = 0.4.17
 h11 = 0.14.0
 h5py = 2.7.1
-idna = 3.3
+idna = 3.4:whl
 igmp = 1.0.4
 Importing = 1.10
 importlib-metadata = 1.7.0:whl
@@ -217,6 +218,7 @@ jupyterlab-launcher = 0.3.1
 jupyterlab-pygments = 0.1.2
 lock-file = 2.0
 lockfile = 0.12.2:whl
+lsprotocol = 2022.0.0a9:whl
 lxml = 4.9.1
 MarkupSafe = 2.0.1
 matplotlib = 2.1.2
@@ -226,7 +228,7 @@ mock = 3.0.5
 more-itertools = 5.0.0
 mpmath = 1.0.0
 msgpack = 0.6.2
-multidict = 6.0.2
+multidict = 6.0.4
 nbclient = 0.5.1
 nbconvert = 6.0.7
 nbformat = 5.0.8
@@ -236,7 +238,7 @@ netifaces = 0.10.7
 notebook = 6.1.5
 openpyxl = 2.5.2
 outcome = 1.2.0
-packaging = 21.3
+packaging = 22.0:whl
 pandocfilters = 1.4.3
 paramiko = 2.11.0
 parso = 0.7.1
@@ -263,7 +265,7 @@ pyasn1 = 0.4.5
 pycparser = 2.20
 pycurl = 7.43.0
 pydantic = 1.9.1
-pygls = 0.12:whl
+pygls = 1.0.0:whl
 Pygments = 2.9.0
 PyNaCl = 1.3.0
 pyOpenSSL = 19.1.0
@@ -329,8 +331,8 @@ widgetsnbextension = 2.0.0
 wsproto = 1.2.0
 xlrd = 1.1.0
 xml-marshaller = 1.0.2
-yarl = 1.7.2
-zc.buildout.languageserver = 0.8.3
+yarl = 1.8.2
+zc.buildout.languageserver = 0.9.0
 zc.lockfile = 1.4
 ZConfig = 3.6.1
 zdaemon = 4.2.0