Update Release Candidate

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.2.2/fish-3.2.2.tar.xz
-md5sum = 606253699ce41991b03a93bcc6047d51
+url = https://github.com/fish-shell/fish-shell/releases/download/3.4.1/fish-3.4.1.tar.xz
+md5sum = 80733d30a14ffa50bf48cce96296aa7a
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}

component/theia/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = 8157c22134200bd862a07c6521ebf799
 
 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = 7c6a0103f9b07cf51940f25b8e3a5730
+md5sum = b1012625be07ad6a3daf27b9ed6004f0

component/theia/download-plugins.cfg

@@ -75,7 +75,7 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.62.3/file/vscode.bat-1.6
 	redhat-java https://open-vsx.org/api/redhat/java/0.61.0/file/redhat.java-0.61.0.vsix 72e548e2845e1ff655f28111558d6942
 	vscjava-vscode-java-test https://open-vsx.org/api/vscjava/vscode-java-test/0.26.0/file/vscjava.vscode-java-test-0.26.0.vsix fd63da5537a4bee1d3ceaae0fa6bf419
 	ms-python-python https://open-vsx.org/api/ms-python/python/2020.9.112786/file/ms-python.python-2020.9.112786.vsix c64b79fa822418e07b6d0f57b8838b44
-	perrinjerome-vscode-zc-buildout https://open-vsx.org/api/perrinjerome/vscode-zc-buildout/0.7.0/file/perrinjerome.vscode-zc-buildout-0.7.0.vsix 7598fa3c1c3701cb2da5c330fe996ff1
+	perrinjerome-vscode-zc-buildout https://open-vsx.org/api/perrinjerome/vscode-zc-buildout/0.7.1/file/perrinjerome.vscode-zc-buildout-0.7.1.vsix 2f1904f6e358c854cc98fff1b9614d0e
 	jebbs-plantuml https://open-vsx.org/api/jebbs/plantuml/2.14.0/file/jebbs.plantuml-2.14.0.vsix 13fa7cbd14a30ecca166c41a307c7a73
 	rafaelmaiolla-diff https://open-vsx.org/api/rafaelmaiolla/diff/0.0.1/file/rafaelmaiolla.diff-0.0.1.vsix 1d8f868bc19b7d703c1be2bf99c4c7f9
 	perrinjerome-git-commit-syntax https://open-vsx.org/api/perrinjerome/git-commit-syntax/0.0.1/file/perrinjerome.git-commit-syntax-0.0.1.vsix 46625f2f05e244911c2cb9cc5032c0ef

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.238'
+version = '1.0.244'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 

slapos/recipe/redis/__init__.py

@@ -33,16 +33,17 @@ class Recipe(GenericBaseRecipe):
   def install(self):
     path_list = []
 
-    if not self.optionIsTrue('use_passwd', False):
+    if not self.optionIsTrue('use-passwd', False):
       master_passwd = "# masterauth <master-password>"
     else:
       master_passwd = "masterauth %s" % self.options['passwd']
-    config_file = self.options['config_file'].strip()
-    configuration = dict(pid_file=self.options['pid_file'],
+    config_file = self.options['config-file'].strip()
+    configuration = dict(
+      pid_file=self.options['pid-file'],
       port=self.options['port'],
       ipv6=self.options['ipv6'],
-                        server_dir=self.options['server_dir'],
-                        log_file=self.options['log_file'],
+      server_dir=self.options['server-dir'],
+      log_file=self.options['log-file'],
       master_passwd=master_passwd
     )
     if self.options.get('unixsocket'):
@@ -58,28 +59,31 @@ class Recipe(GenericBaseRecipe):
 
     redis = self.createWrapper(
       self.options['wrapper'],
-      (self.options['server_bin'], config_file),
+      (self.options['server-bin'], config_file),
     )
     path_list.append(redis)
 
-    promise_script = self.options.get('promise_wrapper', '').strip()
+    promise_script = self.options.get('promise-wrapper', '').strip()
     if promise_script:
-      promise = self.createPythonScript(
+      args = [
+        self.options['cli-bin'],
+        '-h',
+        self.options['ipv6'],
+        '-p',
+        self.options['port'],
+      ]
+      if self.options.get('unixsocket'):
+        args.extend(('-s', self.options['unixsocket']))
+      args.extend((
+        'publish',
+        'Promise-Service',
+        'SlapOS Promise',
+      ))
+      promise = self.createWrapper(
         promise_script,
-        __name__ + '.promise',
-        (self.options['ipv6'], int(self.options['port']),
-         self.options.get('unixsocket'))
+        args,
       )
       path_list.append(promise)
 
     return path_list
 
-
-def promise(host, port, unixsocket):
-  from .MyRedis2410 import Redis
-  try:
-    r = Redis(host=host, port=port, unix_socket_path=unixsocket, db=0)
-    r.publish("Promise-Service","SlapOS Promise")
-    r.connection_pool.disconnect()
-  except Exception as e:
-    sys.exit(e)

slapos/test/recipe/test_redis.py

+import functools
+import os
+import shutil
+import tempfile
+import unittest
+import zc.buildout.testing
+
+
+class TestRedis(unittest.TestCase):
+  def getConfig(self):
+    return {
+      'config-file': self.getTempPath('redis.cfg'),
+      'pid-file': self.getTempPath('redis.pid'),
+      'port': 1234,
+      'ipv6': '::1',
+      'server-dir': self.getTempPath('srv'),
+      'log-file': self.getTempPath('redis.log'),
+      'wrapper': self.getTempPath('wrapper'),
+      'server-bin': '/path/to/bin/redis-server',
+    }
+
+  def setUp(self):
+    self.tmp_dir = tempfile.mkdtemp()
+    self.addCleanup(shutil.rmtree, self.tmp_dir)
+    self.getTempPath = functools.partial(os.path.join, self.tmp_dir)
+
+    self.buildout = buildout = zc.buildout.testing.Buildout()
+    self.config = self.getConfig()
+    buildout['redis'] = self.config
+
+    from slapos.recipe import redis
+    self.recipe = redis.Recipe(buildout, "redis", buildout['redis'])
+
+  def test_install(self):
+    self.installed = self.recipe.install()
+    redis_cfg = self.installed[0]
+    self.assertEqual(redis_cfg, self.config['config-file'])
+    with open(redis_cfg) as f:
+      self.assertIn(self.config['pid-file'], f.read())
+
+    wrapper = self.installed[1]
+    self.assertEqual(wrapper, self.getConfig()['wrapper'])
+    with open(wrapper) as f:
+      self.assertIn('/path/to/bin/redis-server', f.read())
+
+
+class TestRedisWithUnixSocket(TestRedis):
+  def getConfig(self):
+    return dict(
+      super(TestRedisWithUnixSocket, self).getConfig(),
+      unixsocket=self.getTempPath('redis.sock'))
+
+
+class TestRedisWithPassword(TestRedis):
+  def getConfig(self):
+    return dict(
+      super(TestRedisWithPassword, self).getConfig(), passwd='secret')
+
+
+class TestRedisWithPromise(TestRedis):
+  def getConfig(self):
+    return dict(
+      super(TestRedisWithPromise, self).getConfig(), **{
+        'cli-bin': '/path/to/bin/redis-cli',
+        'promise-wrapper': self.getTempPath('promise-wrapper')
+      })
+
+  def test_install(self):
+    super(TestRedisWithPromise, self).test_install()
+    promise_wrapper = self.installed[2]
+    self.assertEqual(promise_wrapper, self.getConfig()['promise-wrapper'])
+    with open(promise_wrapper) as f:
+      self.assertIn('/path/to/bin/redis-cli', f.read())
+
+
+class TestRedisWithUnixSocketAndPromise(TestRedisWithPromise):
+  def getConfig(self):
+    return dict(
+      super(TestRedisWithUnixSocketAndPromise, self).getConfig(),
+      unixsocket=self.getTempPath('redis.sock'))

software/beremiz-ide/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 51071494633f4ffba700baf935dc6955
 
 [template-instance-beremiz-test]
 filename = instance-beremiz-test.cfg.jinja2.in
-md5sum = 6049681908c5619d94499a6f4f224045
+md5sum = ff7cf06927041f6aec5ad559950b69cb
 
 [template-fluxbox-menu.in]
 filename = fluxbox-menu.in

software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in

@@ -30,7 +30,11 @@ recipe = slapos.recipe.template
 inline =
   #!/bin/sh -e
   cd {{ beremiz_location }}/tests
-  make test_dir=${directory:tests} xserver_command='echo "Using ${xserver:display} on Slapos X Server !";' "$@"
+  testdir=$SLAPOS_TEST_LOG_DIRECTORY
+  if [ -z "$testdir" ]; then
+    testdir=${directory:tests}
+  fi
+  make test_dir=$testdir xserver_command='echo "Using ${xserver:display} on Slapos X Server !";' "$@"
 output = ${directory:bin}/beremiztest
 
 [sikulix]

software/theia/buildout.hash.cfg

@@ -51,7 +51,7 @@ md5sum = 1a668d6203d42b4d46d56e24c7606cb2
 
 [python-language-server-requirements.txt]
 _update_hash_filename_ = python-language-server-requirements.txt
-md5sum = febc3e1e18e8e831ac5561e29c3b23d7
+md5sum = bdcf72fc278487de721753f67fd97d56
 
 [slapos.css.in]
 _update_hash_filename_ = slapos.css.in

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

-appdirs==1.4.4
-astroid==2.11.2
-attrs==21.2.0
-black==20.8b1
-cachetools==4.2.4
-certifi==2021.5.30
-chardet==4.0.0
-click==7.1.2
+astroid==2.11.4
+black==22.3.0
+cachetools==5.0.0
+certifi==2021.10.8
+charset-normalizer==2.0.12
+click==8.1.3
 dill==0.3.4
-future==0.18.2
-idna==2.10
-importlib-metadata==3.10.0
-iniconfig==1.1.1
+idna==3.3
+importlib-metadata==4.11.3
 isort==5.10.1
-jedi==0.18.0
+jedi==0.18.1
 lazy-object-proxy==1.7.1
 mccabe==0.7.0
+mypy==0.950
 mypy-extensions==0.4.3
-mypy==0.942
-packaging==21.0
-parso==0.8.2
-pathspec==0.8.1
-platformdirs==2.5.1
-pluggy==0.13.1
+packaging==21.3
+parso==0.8.3
+pathspec==0.9.0
+platformdirs==2.5.2
 pydantic==1.8.2
-pydocstyle==6.0.0
-pyflags==0.1
-pyflakes==2.1.0
-pygls==0.11.1
-pylint==2.13.1
-pyparsing==2.4.7
-regex==2021.4.4
-requests==2.25.1
-rope==0.11.0
-six==1.16.0
-snowballstemmer==1.2.1
+pygls==0.11.3
+pylint==2.13.8
+pyparsing==3.0.8
+requests==2.27.1
 tomli==2.0.1
-typed-ast==1.4.1
-typeguard==2.12.1
-types-requests==2.25.0
-types-toml==0.1.3
-typing-extensions==4.1.1
+typed-ast==1.5.3
+typeguard==2.13.3
+typing_extensions==4.2.0
 urllib3==1.26.9
-wrapt==1.14.0
-yapf==0.31.0
-zc.buildout.languageserver==0.7.0
-zc.buildout==2.13.4
-zipp==3.4.1
\ No newline at end of file
+wrapt==1.14.1
+yapf==0.32.0
+zc.buildout==2.13.7
+zc.buildout.languageserver==0.7.1
+zipp==3.8.0