Commit 51c8147f authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Fixed package and setup structure in dependencies.

parent d601e928
Pipeline #36962 failed with stages
in 3 minutes and 4 seconds
......@@ -12,13 +12,14 @@ stages:
- build
- qa
- test
- release
build:
stage: build
script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de
- docker build -t gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-fair:latest .
- docker push gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-fair:latest
# - docker push $CONTAINER_TEST_IMAGE
linting:
stage: qa
......@@ -26,6 +27,7 @@ linting:
script:
- cd /app
- pwd
- ls -la
- python -m pycodestyle --ignore=E501,E701 nomad tests
- python -m pylint --load-plugins=pylint_mongoengine nomad tests
- python -m mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional nomad tests
......@@ -57,3 +59,11 @@ tests:
- pwd
- ls -la
- python -m pytest --cov=nomad -sv tests
release:
stage: release
script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de
- docker push gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-fair:latest
only:
- master
......@@ -157,35 +157,35 @@ dependencies = [
PythonGit(
name='nomad-meta-info',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-meta-info.git',
git_commit='nomad-xt'),
git_commit='nomad-fair'),
PythonGit(
name='python_common',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/python-common.git',
git_commit='master'), # COMMIT b6f64de2149f95da6a79c4f86fd909b1dcfc23e8
git_commit='nomad-fair'),
PythonGit(
name='parsers/vasp',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/parser-vasp.git',
git_commit='nomad-xt'),
git_commit='nomad-fair'),
PythonGit(
name='parsers/exciting',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/parser-exciting.git',
git_commit='nomad-xt'),
git_commit='nomad-fair'),
PythonGit(
name='parsers/fhi-aims',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/parser-fhi-aims.git',
git_commit='nomad-xt'),
git_commit='nomad-fair'),
PythonGit(
name='normalizers/stats',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/normalizer-stats.git',
git_commit='nomad-xt'),
git_commit='nomad-fair'),
PythonGit(
name='normalizers/symmetry',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/normalizer-symmetry',
git_commit='nomad-xt'),
git_commit='nomad-fair'),
PythonGit(
name='normalizers/system-type',
git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/normalizer-system-type',
git_commit='nomad-xt')
git_commit='nomad-fair')
]
dependencies_dict = {dependency.name: dependency for dependency in dependencies}
......
......@@ -77,7 +77,7 @@ parsers = [
),
LegacyParser(
python_git=dependencies['parsers/exciting'],
parser_class_name='parser_exciting.ExcitingParser',
parser_class_name='excitingparser.ExcitingParser',
main_file_re=r'^.*/INFO\.OUT?',
main_contents_re=(
r'^\s*=================================================+\s*'
......
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