Skip to content

Commit

Permalink
Updating to latest datascience-notebook image (#227)
Browse files Browse the repository at this point in the history
* Updating to latest datascience-notebook image

* Fixing broken dependencies

* Updating test metadata

* More test metadata updates

---------

Co-authored-by: gonimoro <>
  • Loading branch information
gonimoro authored Dec 10, 2024
1 parent 4cee607 commit 0e47d79
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 23 deletions.
22 changes: 9 additions & 13 deletions base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 \
Expand All @@ -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
6 changes: 3 additions & 3 deletions single-user-eosc/tests/julia.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 5 additions & 4 deletions single-user/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/[email protected] \
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 \
Expand Down
6 changes: 3 additions & 3 deletions single-user/tests/julia.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 0e47d79

Please sign in to comment.