diff --git a/libatomsparser/libAtomsParser.py b/libatomsparser/libAtomsParser.py index 2ac434881cdb88009f2c346163de3d7626c34a25..e3384373291020088c562d37cafd97b96a52e711 100644 --- a/libatomsparser/libAtomsParser.py +++ b/libatomsparser/libAtomsParser.py @@ -22,7 +22,6 @@ import logging import numpy as np from nomadcore.local_meta_info import loadJsonFile, InfoKindEl -from nomadcore.parser_backend import JsonParseEventsWriterBackend from contextlib import contextmanager from libatomsparser.libLibAtomsParser import * @@ -48,13 +47,9 @@ class LibAtomsParserWrapper(): self.backend_factory = backend def parse(self, mainfile): - import nomad_meta_info - metaInfoPath = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(nomad_meta_info.__file__)), "lib_atoms.nomadmetainfo.json")) - metaInfoEnv, warnings = loadJsonFile(filePath = metaInfoPath, dependencyLoader = None, extraArgsHandling = InfoKindEl.ADD_EXTRA_ARGS, uri = None) - from unittest.mock import patch logging.info('lib-atoms parser started') logging.getLogger('nomadcore').setLevel(logging.WARNING) - backend = self.backend_factory(metaInfoEnv) + backend = self.backend_factory("lib_atoms.nomadmetainfo.json") # Call the old parser without a class. parserInfo = {'name': 'lib_atoms-parser', 'version': '0.0'} backend = parse_without_class(mainfile, backend, parserInfo) @@ -102,7 +97,6 @@ def parse_without_class(output_file_name, backend, parser_info): jbe.startedParsingSession(output_file_name, parser_info) base_dir = os.path.dirname(os.path.abspath(output_file_name)) - # jbe = JsonParseEventsWriterBackend(meta_info_env) # jbe.startedParsingSession(output_file_name, parser_info) # base_dir = os.path.dirname(os.path.abspath(output_file_name)) diff --git a/libatomsparser/setup_paths.py b/libatomsparser/setup_paths.py deleted file mode 100644 index 41ee4131c853f8d8eefc9d1d9fa495a8d853a817..0000000000000000000000000000000000000000 --- a/libatomsparser/setup_paths.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2016-2018 Fawzi Mohamed, Carl Poelking, Daria Tomecka -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import sys, os, os.path -baseDir = os.path.dirname(os.path.abspath(__file__)) -commonDir = os.path.normpath(os.path.join(baseDir,"../../../../python-common/common/python")) - -if not commonDir in sys.path: - sys.path.insert(0, commonDir)