Commit 0384e472 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merge branch 'bugfixes-dev-setup' into 'v0.9.11'

Fixed some issues in the developer setup process.

See merge request !265
parents 7ece518d dbbce13e
Pipeline #94322 passed with stages
in 21 minutes and 43 seconds
...@@ -33,3 +33,4 @@ gui/src/metainfo.json ...@@ -33,3 +33,4 @@ gui/src/metainfo.json
gui/src/searchQuantities.json gui/src/searchQuantities.json
examples/workdir/ examples/workdir/
gunicorn.log.conf gunicorn.log.conf
nomad/gitinfo.py
\ No newline at end of file
...@@ -47,7 +47,7 @@ python linting: ...@@ -47,7 +47,7 @@ python linting:
script: script:
- cd /app - cd /app
- python -m pycodestyle --ignore=E501,E701,E731 nomad tests - 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 - python -m mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional nomad tests
except: except:
refs: refs:
...@@ -147,6 +147,8 @@ dev setup tests: ...@@ -147,6 +147,8 @@ dev setup tests:
- pip install --upgrade pip - pip install --upgrade pip
- ./setup.sh - ./setup.sh
- python -m nomad.cli parse tests/data/parsers/vasp/vasp.xml - python -m nomad.cli parse tests/data/parsers/vasp/vasp.xml
- python -c "import nomad.app"
- python -c "import nomad.processing"
except: except:
refs: refs:
- tags - tags
......
...@@ -162,18 +162,11 @@ yarn start ...@@ -162,18 +162,11 @@ yarn start
To run the tests some additional settings and files are necessary that are not part To run the tests some additional settings and files are necessary that are not part
of the code base. of the code base.
First you need to create a `nomad.yaml` with the admin password for the user management First, you need to provide the `springer.msg` Springer materials database. It can
system:
```yaml
keycloak:
password: <the-password>
```
Secondly, 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 copied from `/nomad/fairdi/db/data/springer.msg` on our servers and should
be placed at `nomad/normalizing/data/springer.msg`. 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 ```sh
cd docs cd docs
make html make html
......
log, ref, version, commit = "44c7e69 Fixed performance and other isseus.", "heads/mui4", "v0.7.9-398-g44c7e69", "44c7e69"
...@@ -40,7 +40,7 @@ nomadcore ...@@ -40,7 +40,7 @@ nomadcore
nomad_dos_fingerprints nomad_dos_fingerprints
# [infrastructure] # [infrastructure]
optimade==0.8.1 optimade
structlog==20.1.0 structlog==20.1.0
elasticsearch==6.4.0 elasticsearch==6.4.0
msgpack<0.6.0 msgpack<0.6.0
...@@ -62,6 +62,7 @@ zipstream-new==1.1.5 ...@@ -62,6 +62,7 @@ zipstream-new==1.1.5
bagit bagit
bcrypt bcrypt
filelock filelock
cryptography==3.3.2
pyjwt[crypto]==1.7.1 pyjwt[crypto]==1.7.1
jsonschema[format] jsonschema[format]
runstats runstats
......
...@@ -340,7 +340,7 @@ def assert_search_upload( ...@@ -340,7 +340,7 @@ def assert_search_upload(
if __name__ == '__main__': if __name__ == '__main__':
from test_datamodel import generate_calc from .test_datamodel import generate_calc
from elasticsearch.helpers import bulk from elasticsearch.helpers import bulk
import sys import sys
print('Generate index with random example calculation data. First arg is number of items') print('Generate index with random example calculation data. First arg is number of items')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment