From 0e47d791151f4d865d770f1191ecfcb0be747c42 Mon Sep 17 00:00:00 2001
From: gonimoro <91669457+gonimoro@users.noreply.github.com>
Date: Tue, 10 Dec 2024 16:35:43 +0100
Subject: [PATCH] Updating to latest datascience-notebook image (#227)

* Updating to latest datascience-notebook image

* Fixing broken dependencies

* Updating test metadata

* More test metadata updates

---------

Co-authored-by: gonimoro <>
---
 base/Dockerfile                    | 22 +++++++++-------------
 single-user-eosc/tests/julia.ipynb |  6 +++---
 single-user/Dockerfile             |  9 +++++----
 single-user/tests/julia.ipynb      |  6 +++---
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 935b81a..f1d13f2 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,12 +1,12 @@
-# 2024-07-02
-# hub-5.0.0
-# julia-1.10.4
-# lab-4.2.3
-# notebook-7.2.1
-# python-3.11.9
+# 2024-12-10
+# hub-5.2.1
+# julia-1.11.1
+# lab-4.3.2
+# notebook-7.3.1
+# python-3.12.3
 # r-4.3.3
 # ubuntu-22.04
-FROM quay.io/jupyter/datascience-notebook:615b8cc01b33
+FROM quay.io/jupyter/datascience-notebook:87b37b4fd818
 
 USER root
 
@@ -38,6 +38,8 @@ RUN mamba install -y -q \
         cartopy \
         ipyleaflet \
         jupyter-server-proxy \
+        jupyterlab_widgets \
+        nodejs \
     && conda clean --all
 
 RUN pip install --no-cache-dir \
@@ -46,9 +48,3 @@ RUN pip install --no-cache-dir \
         git+https://github.com/EGI-Federation/notebooks-resource-warning
 
 COPY --chown=$NB_UID:$NB_GID overrides.json /opt/conda/share/jupyter/lab/settings/
-
-WORKDIR "${HOME}"
-
-RUN NODE_OPTIONS="--openssl-legacy-provider" \
-    jupyter labextension install \
-        @jupyter-widgets/jupyterlab-manager jupyter-leaflet
diff --git a/single-user-eosc/tests/julia.ipynb b/single-user-eosc/tests/julia.ipynb
index a3645a6..35c75ff 100644
--- a/single-user-eosc/tests/julia.ipynb
+++ b/single-user-eosc/tests/julia.ipynb
@@ -12,15 +12,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.10.4",
+   "display_name": "Julia 1.11.1",
    "language": "julia",
-   "name": "julia-1.10"
+   "name": "julia-1.11"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.10.4"
+   "version": "1.11.1"
   }
  },
  "nbformat": 4,
diff --git a/single-user/Dockerfile b/single-user/Dockerfile
index 7f684a2..0f6939b 100644
--- a/single-user/Dockerfile
+++ b/single-user/Dockerfile
@@ -30,10 +30,10 @@ RUN mamba install -y --quiet \
         PennyLane \
         qiskit \
         qiskit-machine-learning \
-        dwave-ocean-sdk \
         # resource usage info in GUI
         jupyter-resource-usage \
     && conda clean --all
+ 
 
 # Octave, install on a different environment
 # Octave from conda won't build packages
@@ -77,13 +77,14 @@ RUN conda config --add channels bioconda \
         emboss \
     && conda clean --all
 
-# packages not in conda
+# packages not present or not their newest version in conda
 RUN pip install --no-cache-dir \
         git+https://github.com/EGI-Foundation/egi-notebooks-addons@0.1.3 \
         h5glance \
         nbtop \
-        panel
-
+        panel \
+        # quantum SDK
+        dwave-ocean-sdk
 # EMSO
 # python3.7, install on a different environment
 RUN mamba create --name python3.7 -y --quiet -c conda-forge ipython python=3.7 ipykernel libsndfile \
diff --git a/single-user/tests/julia.ipynb b/single-user/tests/julia.ipynb
index a3645a6..35c75ff 100644
--- a/single-user/tests/julia.ipynb
+++ b/single-user/tests/julia.ipynb
@@ -12,15 +12,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.10.4",
+   "display_name": "Julia 1.11.1",
    "language": "julia",
-   "name": "julia-1.10"
+   "name": "julia-1.11"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.10.4"
+   "version": "1.11.1"
   }
  },
  "nbformat": 4,