From 631347247ae7180a0bb0f2a5c4662dc1fbd2f1f9 Mon Sep 17 00:00:00 2001 From: domna Date: Thu, 15 Sep 2022 21:03:35 +0200 Subject: [PATCH 1/2] Corrects typo in mpes example 1 --- docker/mpes/example/E1 Convert to NeXus.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mpes/example/E1 Convert to NeXus.ipynb b/docker/mpes/example/E1 Convert to NeXus.ipynb index d44cd96..0dee4a7 100644 --- a/docker/mpes/example/E1 Convert to NeXus.ipynb +++ b/docker/mpes/example/E1 Convert to NeXus.ipynb @@ -88,7 +88,7 @@ "convert(input_file=[\"MoTe2.h5\", \"config_file.json\", \"eln_data.yaml\"],\n", " reader='mpes',\n", " nxdl='NXmpes',\n", - " output='MoTe.mpes.nxs')" + " output='MoTe2.mpes.nxs')" ] }, { -- GitLab From cfd5839e4be9a21448ad6ca5f07f928b46b3e20e Mon Sep 17 00:00:00 2001 From: domna Date: Thu, 15 Sep 2022 22:00:31 +0200 Subject: [PATCH 2/2] Updates dockerfile to use scipy==1.8.1 --- docker/mpes/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/mpes/Dockerfile b/docker/mpes/Dockerfile index 385851b..59d8365 100644 --- a/docker/mpes/Dockerfile +++ b/docker/mpes/Dockerfile @@ -4,14 +4,15 @@ RUN apt update \ && apt install git pip qt5-default python3-pyqt5 pyqt5-dev-tools cargo -y \ && pip install --upgrade nodejs \ && pip install ipywidgets h5py==3.5.0 h5glance==0.8 h5grove==1.1.0 \ - jupyterlab[full]==3.2.9 jupyterlab_h5web[full]==6.0.0 \ - punx==0.2.5 nexpy==0.14.1 silx[full]==1.0.0 \ + jupyterlab[full]==3.2.9 jupyterlab_h5web[full]==6.0.0 \ + punx==0.2.5 nexpy==0.14.1 silx[full]==1.0.0 \ && jupyter lab build \ && jupyter nbextension enable --py widgetsnbextension \ && jupyter serverextension enable jupyterlab_h5web \ && pip install git+https://github.com/nomad-coe/nomad-parser-nexus.git \ - git+https://github.com/rettigl/mpes@metadata \ - git+https://github.com/FAIRmat-Experimental/arpes.git + git+https://github.com/rettigl/mpes@metadata \ + git+https://github.com/FAIRmat-Experimental/arpes.git \ + && pip install scipy==1.8.1 COPY 02-exec-cmd /config/custom-cont-init.d/02-exec-cmd WORKDIR /config \ No newline at end of file -- GitLab