Merge branch 'v0.9.11' into 'master'

V0.9.11

See merge request !266

.gitignore

@@ -33,3 +33,4 @@ gui/src/metainfo.json
 gui/src/searchQuantities.json
 examples/workdir/
 gunicorn.log.conf
+nomad/gitinfo.py
\ No newline at end of file

.gitlab-ci.yml

@@ -47,7 +47,7 @@ python linting:
   script:
     - cd /app
     - python -m pycodestyle --ignore=E501,E701,E731 nomad tests
-    - python -m pylint --load-plugins=pylint_mongoengine,nomad/metainfo/pylint_plugin nomad tests
+    - python -m pylint --load-plugins=pylint_mongoengine,nomad.metainfo.pylint_plugin nomad tests
     - python -m mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional nomad tests
   except:
     refs:
@@ -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

gui/package.json

 {
   "name": "nomad-fair-gui",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "commit": "e98694e",
   "private": true,
   "dependencies": {

gui/public/env.js

@@ -9,7 +9,7 @@ window.nomadEnv = {
   'matomoUrl': 'https://nomad-lab.eu/fairdi/stat',
   'matomoSiteId': '2',
   'version': {
-    'label': '0.9.10',
+    'label': '0.9.11',
     'isBeta': false,
     'isTest': true,
     'usesBetaData': true,

gui/src/setupTests.js

@@ -8,7 +8,7 @@ global.nomadEnv = {
   'matomoUrl': 'https://nomad-lab.eu/fairdi/stat',
   'matomoSiteId': '2',
   'version': {
-    'label': '0.9.10',
+    'label': '0.9.11',
     'isBeta': false,
     'isTest': true,
     'usesBetaData': true,

nomad/config.py

@@ -283,7 +283,7 @@ datacite = NomadConfig(
 )
 
 meta = NomadConfig(
-    version='0.9.10',
+    version='0.9.11',
     commit=gitinfo.commit,
     release='devel',
     default_domain='dft',

nomad/gitinfo.py

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

ops/helm/nomad/Chart.yaml

 apiVersion: v1
-appVersion: "0.9.10"
+appVersion: "0.9.11"
 description: A Helm chart for Kubernetes that only runs nomad services and uses externally hosted databases.
 name: nomad
-version: 0.9.10
+version: 0.9.11

ops/helm/nomad/values.yaml

 ## Default values for nomad@FAIRDI
 version:
-  label: "0.9.10"
+  label: "0.9.11"
   isTest: false
   isBeta: false
   usesBetaData: false

requirements.txt

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

tests/test_search.py

@@ -340,7 +340,7 @@ def assert_search_upload(
 
 
 if __name__ == '__main__':
-    from test_datamodel import generate_calc
+    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')