software/theia: switch to to zc.recipe.egg to install buildout language server

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = f1b06742154b97d4173dd11e0949569d
+md5sum = 6ddb028e7427913fdcac34b8e727734c
 
 [instance]
 _update_hash_filename_ = instance.cfg.in
@@ -49,10 +49,6 @@ md5sum = e2f6c483cce09f87ab1e63ae8be0daf4
 _update_hash_filename_ = theia_import.py
 md5sum = 1a668d6203d42b4d46d56e24c7606cb2
 
-[python-language-server-requirements.txt]
-_update_hash_filename_ = python-language-server-requirements.txt
-md5sum = 5e1aad3426f971a01717f74d99dda841
-
 [slapos.css.in]
 _update_hash_filename_ = slapos.css.in
 md5sum = d2930ec3ef973b7908f0fa896033fd64

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

@@ -360,7 +360,7 @@ output = $${directory:bin}/$${:_buildout_section_name_}
 inline =
   #!/bin/sh
   export HOME=$${directory:home}
-  export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
+  export PATH=${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
   export IPV6_SLAPRUNNER={{ ipv6_random }}
 
 # Theia Backend
@@ -660,7 +660,8 @@ inline =
       "$${directory:project}/runner/**":true
     },
     "git.terminalAuthentication": false,
-    "security.workspace.trust.startupPrompt": "once"
+    "security.workspace.trust.startupPrompt": "once",
+    "zc-buildout.python.executable": "${python-for-buildout-languageserver:executable}"
   }
 
 [runner-link]

software/theia/python-language-server-requirements.txt

-aiohttp==3.8.1
-aioresponses==0.7.3
-aiosignal==1.2.0
-astroid==2.11.6
-async-timeout==4.0.2
-attrs==21.4.0
-cachetools==5.2.0
-charset-normalizer==2.1.0
-coverage[toml]==6.4.1
-dill==0.3.5.1
-frozenlist==1.3.0
-idna==3.3
-iniconfig==1.1.1
-isort==5.10.1
-lazy-object-proxy==1.7.1
-mccabe==0.7.0
-multidict==6.0.2
-mypy==0.961
-mypy-extensions==0.4.3
-packaging==21.3
-platformdirs==2.5.2
-pluggy==1.0.0
-py==1.11.0
-py-cpuinfo==8.0.0
-pydantic==1.8.2
-pygls==0.11.3
-pylint==2.14.3
-pyparsing==3.0.9
-pytest==7.1.2
-pytest-asyncio==0.18.3
-pytest-benchmark==3.4.1
-pytest-cov==3.0.0
-tomli==2.0.1
-tomlkit==0.11.0
-typeguard==2.13.3
-types-cachetools==5.2.1
-types-setuptools==57.4.18
-types-toml==0.10.7
-typing-extensions==4.2.0
-wrapt==1.14.1
-yapf==0.32.0
-yarl==1.7.2
-zc-buildout==2.13.7
-zc.buildout.languageserver==0.8.1

software/theia/software.cfg

@@ -12,6 +12,7 @@ extends =
   ../../component/coreutils/buildout.cfg
   ../../component/fonts/buildout.cfg
   ../../component/theia/buildout.cfg
+  ../../component/pygolang/buildout.cfg
   ../../stack/slapos.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/resilient/buildout.cfg
@@ -44,6 +45,22 @@ max_version = 0
 install +=
   golang.org/x/tools/gopls@v0.6.6
 
+[versions]
+aiohttp = 3.8.1:whl
+aiosignal = 1.2.0
+async-timeout = 4.0.2
+cachetools = 5.2.0
+frozenlist = 1.3.0
+idna = 3.3
+multidict = 6.0.2
+packaging = 21.3
+pydantic = 1.9.1
+pygls = 0.12:whl
+typeguard = 2.13.3:whl
+typing-extensions = 4.3.0:whl
+yarl = 1.7.2
+zc.buildout.languageserver = 0.8.1
+
 
 # Downloads and templates
 # -----------------------
@@ -59,9 +76,6 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
 destination = ${buildout:directory}/${:_buildout_section_name_}
 output = ${:destination}
 
-[python-language-server-requirements.txt]
-<= download-base
-
 [slapos.css.in]
 <= download-base
 
@@ -115,20 +129,10 @@ eggs =
   supervisor
   setuptools
 
-[python-language-server]
-version = 0.19.0
-recipe = plone.recipe.command
-command =
-  PATH=${git:location}/bin/:$PATH  bash -c "${python3:executable} -m venv --clear ${:location} && \
-    . ${:location}/bin/activate && \
-    pip install -r ${python-language-server-requirements.txt:output}"
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
 
 [cli-utilities]
 PATH = ${nodejs:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:${tig:location}/bin:${vim:location}/bin:${tmux:location}/bin:${git:location}/bin:${curl:location}/bin:${python:location}/bin:${buildout:bin-directory}
 
-
 [python-with-eggs]
 recipe = zc.recipe.egg
 interpreter = ${:_buildout_section_name_}
@@ -152,6 +156,11 @@ needs-these-eggs-scripts-in-path =
   ${supervisor:recipe}
   ${slapos-command:recipe}
 
+[python-for-buildout-languageserver]
+<= python-interpreter
+executable = ${buildout:bin-directory}/${:interpreter}
+eggs +=
+  zc.buildout.languageserver
 
 [software-info]
 slapos = ${buildout:bin-directory}/slapos