Commit 0b859115 authored by Daniel Speckhard's avatar Daniel Speckhard

Fixed parser file structure.

parent 1fdadc0c
......@@ -71,4 +71,4 @@ test/unittests/GTH_POTENTIALS
test/unittests/cp2k_2.6.2/data
# Setuptools install folder
parser/parser-cp2k/cp2kparser.egg-info/
cp2kparser.egg-info/
......@@ -25,7 +25,6 @@ import os
import re
import logging
import importlib
import structlog # New Logging Mechanism introduced for NOMAD-fair.
from nomadcore.baseclasses import ParserInterface
# Needs to be imported in order for the importlib calls to work in python 2.7
......@@ -49,7 +48,12 @@ class CP2KParser(ParserInterface):
metainfo_to_keep, backend, default_units, metainfo_units,
debug, log_level, store
)
self.logger = structlog.get_logger() # New logger keep it in this namespace.
if logger is not None:
self.logger = logger
self.logger.info('received logger')
else:
self.logger = logging.getLogger(__name__)
def setup_version(self):
"""Setups the version by looking at the output file and the version
......
# Copyright 2015-2018 Lauri Himanen, Fawzi Mohamed, Ankit Kariryaa
#
#
# 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.
......@@ -26,7 +26,7 @@ def main():
author="Lauri Himanen",
author_email="lauri.himanen@aalto.fi",
license="GPL3",
package_dir={'': 'parser/parser-cp2k'},
package_dir={'': './'},
packages=find_packages(),
install_requires=[
'nomadcore',
......
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