From a10e490640eee8667297e27b5a7dd81eff95f624 Mon Sep 17 00:00:00 2001 From: Ed Seidewitz Date: Mon, 6 May 2024 13:14:07 -0400 Subject: [PATCH 1/3] ST6RI-765 Updated Jupyter deploy to JupyterLab 3.x and Node.js 16.20.2. --- org.omg.sysml.jupyter.installer/.classpath | 15 ++++++++++++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.omg.sysml.jupyter.installer/install.sh | 2 +- org.omg.sysml.jupyter.jupyterlab/.classpath | 15 ++++++++++++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.omg.sysml.jupyter.jupyterlab/package.json | 6 +++++- 6 files changed, 40 insertions(+), 10 deletions(-) diff --git a/org.omg.sysml.jupyter.installer/.classpath b/org.omg.sysml.jupyter.installer/.classpath index 4559ca0b2..c6bb293e0 100644 --- a/org.omg.sysml.jupyter.installer/.classpath +++ b/org.omg.sysml.jupyter.installer/.classpath @@ -13,7 +13,7 @@ - + @@ -23,5 +23,18 @@ + + + + + + + + + + + + + diff --git a/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs index 2af1e7b99..cf2cd4590 100644 --- a/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.omg.sysml.jupyter.installer/install.sh b/org.omg.sysml.jupyter.installer/install.sh index 043477e7b..3d604108e 100755 --- a/org.omg.sysml.jupyter.installer/install.sh +++ b/org.omg.sysml.jupyter.installer/install.sh @@ -34,7 +34,7 @@ java -version echo "--- Step 3: Installing Jupyter SysML kernel and dependencies ---" jupyter kernelspec remove sysml -f > /dev/null 2>&1 || true -conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=2.* graphviz=2.* nodejs=15.* -c conda-forge -y +conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=3.* graphviz=2.* nodejs=16.20.2 -c conda-forge -y echo "--- Step 4: Installing JupyterLab SysML extension ---" jupyter labextension uninstall @systems-modeling/jupyterlab-sysml > /dev/null 2>&1 || true diff --git a/org.omg.sysml.jupyter.jupyterlab/.classpath b/org.omg.sysml.jupyter.jupyterlab/.classpath index 4559ca0b2..c6bb293e0 100644 --- a/org.omg.sysml.jupyter.jupyterlab/.classpath +++ b/org.omg.sysml.jupyter.jupyterlab/.classpath @@ -13,7 +13,7 @@ - + @@ -23,5 +23,18 @@ + + + + + + + + + + + + + diff --git a/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs index 2af1e7b99..cf2cd4590 100644 --- a/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.omg.sysml.jupyter.jupyterlab/package.json b/org.omg.sysml.jupyter.jupyterlab/package.json index 3b9e39c30..15bf877b9 100644 --- a/org.omg.sysml.jupyter.jupyterlab/package.json +++ b/org.omg.sysml.jupyter.jupyterlab/package.json @@ -11,13 +11,17 @@ "jupyterlab-extension" ], "dependencies": { - "@jupyterlab/application": "2.x" + "@jupyterlab/application": "3.x" }, "devDependencies": { "@types/codemirror": "^0.0.98", "@types/json-schema": "*", "typescript": "<4.4.0" }, + "resolutions": { + "@lumino/coreutils": "^1.11.0", + "@lumino/widgets": "^1.37.2" + }, "peerDependencies": { "codemirror": "^5.58.1" }, From 7336abd366b71c63373112bbca7e5f1f9898660e Mon Sep 17 00:00:00 2001 From: Ed Seidewitz Date: Tue, 7 May 2024 16:39:59 -0400 Subject: [PATCH 2/3] ST6RI-765 Changed nodejs version in Jupyter install script Version 16.20.1 is not actually available for conda, so instead used "<17" to get latest available version. --- org.omg.sysml.jupyter.installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.omg.sysml.jupyter.installer/install.sh b/org.omg.sysml.jupyter.installer/install.sh index 3d604108e..77dc2f25d 100755 --- a/org.omg.sysml.jupyter.installer/install.sh +++ b/org.omg.sysml.jupyter.installer/install.sh @@ -34,7 +34,7 @@ java -version echo "--- Step 3: Installing Jupyter SysML kernel and dependencies ---" jupyter kernelspec remove sysml -f > /dev/null 2>&1 || true -conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=3.* graphviz=2.* nodejs=16.20.2 -c conda-forge -y +conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=3.* graphviz=2.* nodejs="<17" -c conda-forge -y echo "--- Step 4: Installing JupyterLab SysML extension ---" jupyter labextension uninstall @systems-modeling/jupyterlab-sysml > /dev/null 2>&1 || true From 4151f837e3580506c46dd95c3a1bc8d8859a2fcd Mon Sep 17 00:00:00 2001 From: Ed Seidewitz Date: Tue, 7 May 2024 16:56:44 -0400 Subject: [PATCH 3/3] ST6RI-765 Updated JupyterLab installer "install.bat". --- org.omg.sysml.jupyter.installer/install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.omg.sysml.jupyter.installer/install.bat b/org.omg.sysml.jupyter.installer/install.bat index cd644e05d..499220c7f 100755 --- a/org.omg.sysml.jupyter.installer/install.bat +++ b/org.omg.sysml.jupyter.installer/install.bat @@ -41,7 +41,7 @@ call java -version || goto :error echo --- Step 3: Installing Jupyter SysML kernel and dependencies --- call jupyter kernelspec remove sysml -f >nul 2>&1 -call conda install "jupyter-sysml-kernel=%SYSML_VERSION%" python=3.* jupyterlab=2.* graphviz=2.* nodejs=14.* -c conda-forge -y || goto:error +call conda install "jupyter-sysml-kernel=%SYSML_VERSION%" python=3.* jupyterlab=3.* graphviz=2.* nodejs="<17" -c conda-forge -y || goto:error echo --- Step 4: Installing JupyterLab SysML extension --- call jupyter labextension uninstall @systems-modeling/jupyterlab-sysml