Commit 6a36adfa authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Fixed missing test data. Removed .dependencies dependencies.

parent 5f57010a
Pipeline #36969 passed with stages
in 3 minutes and 15 seconds
......@@ -15,7 +15,7 @@ stages:
- release
variables:
CONTAINER_TEST_IMAGE: gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-fair:$CI_BUILD_REF_NAME
CONTAINER_TEST_IMAGE: gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-fair:test
CONTAINER_RELEASE_IMAGE: gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-fair:latest
build:
......@@ -67,5 +67,4 @@ release:
- docker pull $CONTAINER_TEST_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
- docker push $CONTAINER_RELEASE_IMAGE
only:
- master
when: manual
......@@ -16,11 +16,6 @@ import sys
from recommonmark.transform import AutoStructify
sys.path.insert(0, os.path.abspath('..'))
# TODO, once the normalizers are self contained in their own gits, this should not be
# necessary anymore
sys.path.insert(0, os.path.abspath('../.dependencies/normalizers/stats/normalizer/normalizer-stats'))
sys.path.insert(0, os.path.abspath('../.dependencies/normalizers/symmetry/normalizer/normalizer-symmetry'))
sys.path.insert(0, os.path.abspath('../.dependencies/normalizers/system-type/normalizer/normalizer-system-type'))
# -- Project information -----------------------------------------------------
......
......@@ -25,6 +25,7 @@ from ase.data import chemical_symbols
import numpy
from nomadcore.local_meta_info import loadJsonFile, InfoKindEl
import nomad_meta_info
from nomad.parsing.backend import LocalBackend
from nomad.parsing.parser import Parser
......@@ -35,9 +36,8 @@ class ArtificalParser(Parser):
def __init__(self):
super().__init__()
# use vasp metainfo, not to really use it, but because it works
file_dir = os.path.dirname(os.path.abspath(__file__))
relative_metainfo_path = "../../.dependencies/nomad-meta-info/meta_info/nomad_meta_info/vasp.nomadmetainfo.json"
meta_info_path = os.path.normpath(os.path.join(file_dir, relative_metainfo_path))
file_dir = os.path.dirname(os.path.abspath(nomad_meta_info.__file__))
meta_info_path = os.path.normpath(os.path.join(file_dir, 'vasp.nomadmetainfo.json'))
self.meta_info_env, _ = loadJsonFile(filePath=meta_info_path, dependencyLoader=None, extraArgsHandling=InfoKindEl.ADD_EXTRA_ARGS, uri=None)
self.backend = None
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -18,6 +18,7 @@ import json
import pytest
from nomadcore.local_meta_info import loadJsonFile
import nomad_meta_info
from nomad.parsing import JSONStreamWriter, parser_dict
from nomad.parsing import LocalBackend, BadContextURI
......@@ -25,9 +26,9 @@ from nomad.parsing import LocalBackend, BadContextURI
parser_examples = [
('parsers/random', 'test/data/parsers/random_0'),
('parsers/template', 'tests/data/parsers/template.json'),
('parsers/exciting', '.dependencies/parsers/exciting/test/examples/Ag/INFO.OUT'),
('parsers/exciting', '.dependencies/parsers/exciting/test/examples/GW/INFO.OUT'),
('parsers/vasp', '.dependencies/parsers/vasp/test/examples/xml/perovskite.xml'),
('parsers/exciting', 'tests/data/parsers/exciting/Ag/INFO.OUT'),
('parsers/exciting', 'tests/data/parsers/exciting/GW/INFO.OUT'),
('parsers/vasp', 'tests/data/parsers/vasp.xml'),
('parsers/fhi-aims', 'tests/data/parsers/aims.out')
]
......@@ -36,7 +37,8 @@ class TestLocalBackend(object):
@pytest.fixture(scope='session')
def meta_info(self):
path = '.dependencies/nomad-meta-info/meta_info/nomad_meta_info/all.nomadmetainfo.json'
file_dir = os.path.dirname(os.path.abspath(nomad_meta_info.__file__))
path = os.path.join(file_dir, 'all.nomadmetainfo.json')
meta_info, _ = loadJsonFile(path)
return meta_info
......
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