Version up many packages

See merge request nexedi/slapos!1235

component/fish-shell/buildout.cfg

@@ -14,8 +14,8 @@ extends =
 [fish-shell]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/fish-shell/fish-shell/releases/download/3.5.0/fish-3.5.0.tar.xz
-md5sum = aea858def631da76e1313936e79651fd
+url = https://github.com/fish-shell/fish-shell/releases/download/3.5.1/fish-3.5.1.tar.xz
+md5sum = 59950f8ec9bf9e2fa02ff205dc5a9c57
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}

component/restic/buildout.cfg

@@ -26,4 +26,4 @@ location = ${:output}
 <= go-git-package
 go.importpath = github.com/restic/restic
 repository =  https://github.com/restic/restic
-revision = v0.9.6
+revision = v0.14.0-0-g1bc87e17

component/theia/buildout.hash.cfg

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

component/tig/buildout.cfg

@@ -9,8 +9,8 @@ extends =
 [tig]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/jonas/tig/releases/download/tig-2.5.5/tig-2.5.5.tar.gz
-md5sum = 0902ba706e8efaf6c2087d8b66393375
+url = https://github.com/jonas/tig/releases/download/tig-2.5.7/tig-2.5.7.tar.gz
+md5sum = 307e966837370ba698286a1c48d31a7f
 environment =
   CFLAGS=-I${ncurses:location}/include -I${libiconv:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libiconv:location}/lib -Wl,-rpath=${libiconv:location}/lib

component/tmux/buildout.cfg

@@ -8,8 +8,8 @@ parts +=
 
 [tmux]
 recipe = slapos.recipe.cmmi
-url = https://github.com/tmux/tmux/releases/download/2.9a/tmux-2.9a.tar.gz
-md5sum = f0564dbf4cf6b301c4845219d27ed3ad
+url = https://github.com/tmux/tmux/releases/download/3.3a/tmux-3.3a.tar.gz
+md5sum = 8eee5883b9f6550fa4efaad0c9ec38f3
 shared = true
 environment =
   CFLAGS=-I${ncurses:location}/include -I${libevent2:location}/include/

software/backupserver/test/test.py

@@ -26,7 +26,6 @@
 ##############################################################################
 
 
-import httplib
 import json
 import os
 import requests
@@ -54,7 +53,7 @@ class TestBackupServer(InstanceTestCase):
 
     # XXX crontab not triggered yet
     self.assertEqual(
-      [httplib.NOT_FOUND, False],
+      [requests.codes.not_found, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -65,6 +64,6 @@ class TestBackupServer(InstanceTestCase):
     result = requests.get(
       parameter_dict['monitor-base-url'], verify=False, allow_redirects=False)
     self.assertEqual(
-      [httplib.UNAUTHORIZED, False],
+      [requests.codes.unauthorized, False],
       [result.status_code, result.is_redirect]
     )

software/caucase/test/test.py

@@ -29,7 +29,7 @@ from __future__ import unicode_literals
 import json
 import os
 import requests
-import httplib
+
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
@@ -51,7 +51,7 @@ class TestCaucase(SlapOSInstanceTestCase):
     )
     result = requests.get(connection_parameter_dict['url'])
 
-    self.assertEqual(result.status_code, httplib.OK)
+    self.assertEqual(result.status_code, requests.codes.ok)
     self.assertEqual(
       result.json(),
       {

software/htmlvalidatorserver/test/test.py

@@ -26,7 +26,6 @@
 ##############################################################################
 
 
-import httplib
 import json
 import os
 import requests
@@ -53,7 +52,7 @@ class TestHtmlValidatorServer(InstanceTestCase):
       parameter_dict['vnu-url'], verify=False, allow_redirects=False)
 
     self.assertEqual(
-      [httplib.OK, False, 'Apache-Coyote/1.1'],
+      [requests.codes.ok, False, 'Apache-Coyote/1.1'],
       [result.status_code, result.is_redirect, result.headers['Server']]
     )
 
@@ -64,7 +63,7 @@ class TestHtmlValidatorServer(InstanceTestCase):
     result = requests.get(
       parameter_dict['monitor-base-url'], verify=False, allow_redirects=False)
     self.assertEqual(
-      [httplib.UNAUTHORIZED, False],
+      [requests.codes.unauthorized, False],
       [result.status_code, result.is_redirect]
     )
 

software/jstestnode/software.cfg

@@ -36,8 +36,8 @@ parts =
 recipe = zc.recipe.egg
 eggs =
   erp5.util
-  urllib3[secure]
   selenium
+  certifi
   ${lxml-python:egg}
 interpreter = pythonwitheggs
 
@@ -128,4 +128,4 @@ output = ${buildout:directory}/template-nginx.cfg.in
 output = ${buildout:directory}/runTestSuite.in
 
 [versions]
-selenium = 3.14.1
+selenium = 3.141.0

software/jstestnode/test/test.py

@@ -26,9 +26,11 @@
 ##############################################################################
 
 
-import httplib
+import glob
 import json
 import os
+import subprocess
+
 import requests
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
@@ -59,7 +61,7 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       '%sjio/test/tests.html' % (connection_dict['nginx'], ), allow_redirects=False)
     self.assertEqual(
-      [httplib.OK, False],
+      [requests.codes.ok, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -67,7 +69,7 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       '%srenderjs/test/' % (connection_dict['nginx'], ), allow_redirects=False)
     self.assertEqual(
-      [httplib.OK, False],
+      [requests.codes.ok, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -75,7 +77,7 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       '%srsvp/test/index.html' % (connection_dict['nginx'], ), allow_redirects=False)
     self.assertEqual(
-      [httplib.OK, False],
+      [requests.codes.ok, False],
       [result.status_code, result.is_redirect]
     )
 
@@ -83,6 +85,18 @@ class TestJSTestNode(InstanceTestCase):
     result = requests.get(
       'http://[%s]:9443' % (self._ipv6_address, ), allow_redirects=False)
     self.assertEqual(
-      [httplib.FORBIDDEN, False],
+      [requests.codes.forbidden, False],
       [result.status_code, result.is_redirect]
     )
+
+  def test_runTestSuite(self):
+    runTestSuite_output = subprocess.check_output(
+      [
+        os.path.join(
+          self.computer_partition_root_path,
+          'bin',
+          'runTestSuite',
+        ),
+       '--help',
+      ])
+    self.assertTrue(runTestSuite_output)

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

stack/slapos.cfg

@@ -181,18 +181,18 @@ psutil = 5.8.0
 pluggy = 0.13.1:whl
 py = 1.9.0:whl
 pyOpenSSL = 19.1.0
-pyparsing = 2.2.0
+pyparsing = 3.0.9:whl
 py-mld = 1.0.3
 pyroute2 = 0.6.9
-pytz = 2016.10
+pytz = 2022.2.1
 regex = 2020.9.27
-requests = 2.27.1
-charset-normalizer = 2.0.12
+requests = 2.28.1
+charset-normalizer = 2.1.1
 scandir = 1.10.0
 setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
-six = 1.12.0
+six = 1.16.0
 slapos.cookbook = 1.0.253
 slapos.core = 1.7.13
 slapos.extension.shared = 1.0
@@ -229,7 +229,7 @@ enum34 = 1.1.10
 erp5.util = 0.4.74
 feedparser = 5.2.1
 functools32 = 3.2.3.post2
-attrs = 18.2.0
+attrs = 22.1.0
 pyrsistent = 0.16.1
 pytest-runner = 5.2:whl
 ipaddress = 1.0.23
@@ -247,18 +247,23 @@ rpdb = 0.1.5
 supervisor = 4.1.0
 tzlocal = 1.5.1
 uritemplate = 3.0.0
-zope.interface = 4.3.3
-certifi = 2020.6.20
+zope.interface = 5.4.0
+certifi = 2022.6.15
 chardet = 3.0.4
-urllib3 = 1.26.9
+urllib3 = 1.26.12
 pkgconfig = 1.5.1
 distro = 1.7.0
 
 
 [versions:python2]
+attrs = 18.2.0
 click = 6.7
 distro = 1.6.0
 Werkzeug = 1.0.1
+requests = 2.27.1
+charset-normalizer = 2.0.12
+pyparsing = 2.2.0
+certifi = 2020.04.05.1
 
 [versions:sys.version_info < (3,8)]
 MarkupSafe = 1.0