Merge branch 'v0.9.11' into v0.10.0

.gitignore

@@ -34,3 +34,5 @@ parser.osio.log
 gui/src/metainfo.json
 gui/src/searchQuantities.json
 examples/workdir/
+gunicorn.log.conf
+nomad/gitinfo.py

.gitlab-ci.yml

@@ -147,6 +147,8 @@ dev setup tests:
     - pip install --upgrade pip
     - ./setup.sh
     - python -m nomad.cli parse tests/data/parsers/vasp/vasp.xml
+    - python -c "import nomad.app"
+    - python -c "import nomad.processing"
   except:
     refs:
       - tags

vasp @ 56eb84ff

-Subproject commit 4c35bae7f2834e9657eea438c0a98f8810ac415b
+Subproject commit 56eb84fffa3ae25a4b8dc10aa56da85a4fe6584d

docs/developers.md

@@ -162,18 +162,11 @@ yarn start
 To run the tests some additional settings and files are necessary that are not part
 of the code base.
 
-First you need to create a `nomad.yaml` with the admin password for the user management
-system:
-```yaml
-keycloak:
-  password: <the-password>
-```
-
-Secondly, you need to provide the `springer.msg` Springer materials database. It can
+First, you need to provide the `springer.msg` Springer materials database. It can
 be copied from `/nomad/fairdi/db/data/springer.msg` on our servers and should
 be placed at `nomad/normalizing/data/springer.msg`.
 
-Thirdly, you have to provide static files to serve the docs and NOMAD distribution:
+Second, you have to provide static files to serve the docs and NOMAD distribution:
 ```sh
 cd docs
 make html

nomad/gitinfo.py

-log, ref, version, commit = "44c7e69 Fixed performance and other isseus.", "heads/mui4", "v0.7.9-398-g44c7e69", "44c7e69"

ops/helm/nomad/templates/api-deployment.yaml

@@ -168,11 +168,11 @@ spec:
           name: staging-volume
         - mountPath: /nomad
           name: nomad-volume
-        - mountPath: /app/nomad/static/gui/env.js
+        - mountPath: /app/nomad/app/static/gui/env.js
           readOnly: true
           subPath: env.js
           name: gui-env-js
-        - mountPath: /app/nomad/static/encyclopedia/conf.js
+        - mountPath: /app/nomad/app/static/encyclopedia/conf.js
           readOnly: true
           subPath: conf.js
           name: enc-conf-js

requirements.txt

@@ -41,7 +41,7 @@ nomadcore
 nomad_dos_fingerprints
 
 # [infrastructure]
-optimade==0.8.1
+optimade
 structlog==20.1.0
 elasticsearch==6.4.0
 msgpack<0.6.0
@@ -63,6 +63,7 @@ zipstream-new==1.1.5
 bagit
 bcrypt
 filelock
+cryptography==3.3.2
 pyjwt[crypto]==1.7.1
 cryptography==3.3.2
 jsonschema[format]

tests/test_search.py

@@ -339,7 +339,7 @@ def assert_search_upload(
 
 
 if __name__ == '__main__':
-    from test_datamodel import generate_calc  # pylint: disable=import-error
+    from .test_datamodel import generate_calc
     from elasticsearch.helpers import bulk
     import sys
     print('Generate index with random example calculation data. First arg is number of items')