Commit 1995952d authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merge branch 'v0.8.4' into 'master'

V0.8.4

See merge request !139
parents cc540ed5 8d9744c5
Pipeline #79921 passed with stages
in 20 minutes and 15 seconds
...@@ -29,3 +29,4 @@ build/ ...@@ -29,3 +29,4 @@ build/
dist/ dist/
setup.json setup.json
parser.osio.log parser.osio.log
gui/src/metainfo.json
...@@ -62,6 +62,12 @@ gui_linting: ...@@ -62,6 +62,12 @@ gui_linting:
- cd gui - cd gui
- yarn - yarn
- yarn run eslint 'src/**/*.js' - yarn run eslint 'src/**/*.js'
except:
refs:
- tags
variables:
- $CI_COMMIT_REF_NAME =~ /^dev-.*$/
- $CI_COMMIT_MESSAGE =~ /\[skip[ _-]tests?\]/i
tests: tests:
stage: test stage: test
...@@ -111,6 +117,12 @@ install_tests: ...@@ -111,6 +117,12 @@ install_tests:
- python -c "import nomad.datamodel, nomad.datamodel.metainfo, nomad.client" - python -c "import nomad.datamodel, nomad.datamodel.metainfo, nomad.client"
- pip install `echo dist/nomad-lab-*.tar.gz`[parsing] - pip install `echo dist/nomad-lab-*.tar.gz`[parsing]
- python -m nomad.cli parse tests/data/parsers/vasp/vasp.xml - python -m nomad.cli parse tests/data/parsers/vasp/vasp.xml
except:
refs:
- tags
variables:
- $CI_COMMIT_REF_NAME =~ /^dev-.*$/
- $CI_COMMIT_MESSAGE =~ /\[skip[ _-]tests?\]/i
dev_setup_tests: dev_setup_tests:
stage: test stage: test
...@@ -119,6 +131,12 @@ dev_setup_tests: ...@@ -119,6 +131,12 @@ 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
except:
refs:
- tags
variables:
- $CI_COMMIT_REF_NAME =~ /^dev-.*$/
- $CI_COMMIT_MESSAGE =~ /\[skip[ _-]tests?\]/i
deploy: deploy:
stage: deploy stage: deploy
......
...@@ -109,10 +109,6 @@ ...@@ -109,10 +109,6 @@
path = dependencies/parsers/turbomole path = dependencies/parsers/turbomole
url = https://gitlab.mpcdf.mpg.de/nomad-lab/parser-turbomole.git url = https://gitlab.mpcdf.mpg.de/nomad-lab/parser-turbomole.git
branch = nomad-fair branch = nomad-fair
[submodule "dependencies/parsers/photoemission"]
path = dependencies/parsers/photoemission
url = https://gitlab.mpcdf.mpg.de/nomad-lab/parser-photoemission.git
branch = nomad-fair
[submodule "dependencies/parsers/skeleton"] [submodule "dependencies/parsers/skeleton"]
path = dependencies/parsers/skeleton path = dependencies/parsers/skeleton
url = https://gitlab.mpcdf.mpg.de/nomad-lab/parser-skeleton.git url = https://gitlab.mpcdf.mpg.de/nomad-lab/parser-skeleton.git
......
Subproject commit 62716704fcc6f74d5820311bffa7e7ebb0bf38c2 Subproject commit 669c75e414d128c8303291ce58b16a01d2d98633
Subproject commit 56e9412d0d322fd88240fe2af41716a0016831c7 Subproject commit e7077c9a824e01b45b0e4989858ecd35f59f4cc7
Subproject commit d394f7ae375cd2355127abc67e07b1592f18d4f4 Subproject commit ed482b9956088163db9370dd5eee9b184c47870a
Subproject commit 7decbdcf25ef48b019bde17c472f54d65a124c9a Subproject commit cc6c9545300cf6ea3347357fedffc6798415a299
Subproject commit 0a3e003535d12b987f5774fc631cb142b6d245c6 Subproject commit 1211d4b79907d9a987422193b3f97efd69962a3c
Subproject commit 059d4c7f1a452383d67f0ecf0c9bc267580083dc Subproject commit fa54fe567a1250af3009ecc9692d14c64a399f29
Subproject commit 6f0e7ec897284382d8ef30b0ee0372f010ce468f Subproject commit 136ab4f5c17e340009a14df8dbb72dc101acb1b1
Subproject commit f7f156204c16b54e4df998a8a275bcf4a5aaf901 Subproject commit 2310b63ff3904ddd6f912c32789568787c6ab250
Subproject commit 8d896ede93e794d0fdb905e42281ef7c871bc05d Subproject commit b7d913f0d8f82a9bb564e346bb60f66008ac791b
Subproject commit aa701e8f2780419e7911972c8e2a16d188008902 Subproject commit d4083cdadd4b34b9d99cbeed579c56c09aa7606b
Subproject commit 97b653e3fe695775f53a96249a0bb9ad694ef742 Subproject commit a741cfe607e9dfd1f2d65aeddbcc4bc5a15bbc13
Subproject commit fc29369476e84f8d95de4ef1bdf6d1ce2f55cdc9
Subproject commit 85cc99b320454f8c8a68bdf376e128c156cf2ac2 Subproject commit 7f5fc6a358dc7e40e716cc5205fa04e8cf9c6d6c
Subproject commit 1a0c8cb0801375a78134c67f7a6d31319a338503 Subproject commit 8c2e56b0d9d17b777b5fa6a61c8e2877444ab603
Subproject commit 16f7a7f6909dbe16908d1be2e1fa03d3bddd17b5 Subproject commit d58ac9b61ba2c9e82f50a30c2c234778743d51ad
Subproject commit cf843eda3e4650bc240eb0d1a1ab5b0cea6dda96 Subproject commit afdd0937aab2681ca3912cfd9d95c7633fdcd7b9
Markdown is supported
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