Resolve conflict merge with master

.gitmodules

@@ -28,3 +28,6 @@
 [submodule "3rdparty/qmmlpack"]
 	path = 3rdparty/qmmlpack
 	url = https://gitlab.com/qmml/qmmlpack.git
+[submodule "tutorials/analytics-query-nomad-repository"]
+	path = tutorials/analytics-query-nomad-repository
+	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-query-nomad-repository
\ No newline at end of file

Dockerfile

@@ -46,6 +46,7 @@ RUN conda install --quiet --yes \
     'dscribe' \
     'pytest' \
  && conda clean -tipsy \
+ && pip install https://labdev-nomad.esc.rzg.mpg.de/fairdi/nomad/testing-major/dist/nomad-0.8.0.tar.gz \
  && jupyter nbextensions_configurator enable --user \
  && jupyter nbextension install nglview --py --sys-prefix \
  && jupyter nbextension enable nglview --py --sys-prefix \
@@ -85,6 +86,10 @@ ENV PYTHONPATH "/opt/qmmlpack/python":$PYTHONPATH
 ENV CML_PLUGINS "cscribe"
 ENV CML_DATASET_PATH $HOME/tutorials/data/cmlkit/
 
+# Dependecies:
+# - ase: many
+# - nglview: many
+# - asap3: grain-boundaries
 
 # ================================================================================
 #  QUIP + GAP + quippy
@@ -133,9 +138,9 @@ RUN pip install ./analytics-gap-si-surface
 RUN pip install ./analytics-grain-boundaries
 RUN pip install ./analytics-kaggle-competition
 RUN pip install ./analytics-soap-atomic-charges
-RUN pip install ./analytics-tcmi; exit 0
-RUN pip install ./analytics-cmlkit; exit 0
-
+RUN pip install ./analytics-cmlkit
+RUN pip install ./analytics-tcmi
+RUN pip install -r ./analytics-query-nomad-repository/requirements.txt
 
 USER root
 

analytics-compressed-sensing @ 92df957d

-Subproject commit e965836bb6dd4e586b20746d59f9e3b1a32ab9cf
+Subproject commit 92df957da8cea44beb5d823bcd064980c215d6e6

analytics-convolutional-nn @ 41da4bc9

-Subproject commit 57380f528dde300309657527ef612a107b5196f2
+Subproject commit 41da4bc9c67786937b597cc8158d3d566dd34282

analytics-gap-si-surface @ cb7dd646

-Subproject commit f2c9e69a8de37f27a5f08f4d7d098606026c75dc
+Subproject commit cb7dd646000955e289df871ec44abf6a0826301b

analytics-grain-boundaries @ d0a0b35a

-Subproject commit 01c94c55477b4b84f3cf8b2e8d1dc73ce1e6abea
+Subproject commit d0a0b35a5386b4cf474426b2d26ea7b0d0fd2f7f

analytics-kaggle-competition @ 2711861c

-Subproject commit bd59de7cd20de0cf331620926fefb5e79d65c859
+Subproject commit 2711861c6e4c31b3665995ea9f3616843992c022

analytics-query-nomad-repository @ b3f0de71

+Subproject commit b3f0de719405d78b49554e1ac99857f2d6ec9b82

analytics-soap-atomic-charges @ 7644b637

-Subproject commit 13fd5e6faa39fc359b86294805de4c451f645d47
+Subproject commit 7644b6372452bcbd0c53508179aacd572e1cb12d

analytics-tcmi @ 292d7a1f

-Subproject commit 58bd31fe94aed52cae3386853955e5ea382aeb81
+Subproject commit 292d7a1fa24c5a0e70b2d33a2dc759ecb0d57123