From 27784311dd7517c5fd11411a5caa5086b44ebe55 Mon Sep 17 00:00:00 2001 From: Clement DAVID Date: Wed, 4 Dec 2024 10:22:22 +0100 Subject: [PATCH 1/2] parse Scilab version as numbers to be able to compare them --- scilab_kernel.ipynb | 2 +- scilab_kernel/kernel.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scilab_kernel.ipynb b/scilab_kernel.ipynb index 4a522b0..52463a3 100644 --- a/scilab_kernel.ipynb +++ b/scilab_kernel.ipynb @@ -12,7 +12,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "metadata": {}, "outputs": [ { diff --git a/scilab_kernel/kernel.py b/scilab_kernel/kernel.py index c07315b..3bf3df8 100644 --- a/scilab_kernel/kernel.py +++ b/scilab_kernel/kernel.py @@ -83,14 +83,14 @@ def executable(self): @property def banner(self): if self._banner is None: - resp = self.do_execute_direct("getversion()", silent=True) + resp = self.do_execute_direct("getversion scilab", silent=True) if resp: - # ans = + # ans = [1x4 double] # - # "scilab-branch-2024.1" - result = re.search(r'scilab-([a-zA-Z0-9\-\.]+)', resp.output) + # 2025. 0. 0. 1.730D+09 + result = re.search(r'([0-9]+)\. +([0-9]+)\.', resp.output) if result: - self._banner = result.group(1) + self._banner = result.group(1) + "." + result.group(2) self.log.warning(' scilab_kernel._banner: ' + self._banner) if self._banner is None: self._banner = "Unknown version" From 04cc6fe0617819a7c0fba519e78a2db7e9a46c94 Mon Sep 17 00:00:00 2001 From: Clement DAVID Date: Wed, 4 Dec 2024 10:41:44 +0100 Subject: [PATCH 2/2] revert ipynb changes --- scilab_kernel.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scilab_kernel.ipynb b/scilab_kernel.ipynb index 52463a3..4a522b0 100644 --- a/scilab_kernel.ipynb +++ b/scilab_kernel.ipynb @@ -12,7 +12,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": {}, "outputs": [ {