From 9eef65dacfa51f3d3a00637179d7def922fe085b Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Wed, 8 Aug 2018 20:32:13 +0200
Subject: [PATCH] Fixed 'relative' imports.
---
parser/parser-vasp/vaspparser/parser.py | 10 +++++-----
parser/parser-vasp/vaspparser/parser_vasp.py | 8 ++++----
parser/parser-vasp/vaspparser/parser_vasprun.py | 9 ++++-----
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/parser/parser-vasp/vaspparser/parser.py b/parser/parser-vasp/vaspparser/parser.py
index 5c4ccb7..87bdf7a 100644
--- a/parser/parser-vasp/vaspparser/parser.py
+++ b/parser/parser-vasp/vaspparser/parser.py
@@ -1,11 +1,11 @@
# Copyright 2016-2018 Fawzi Mohamed, Lauri Himanen, Danio Brambila, Ankit Kariryaa, Henning Glawe
-#
+#
# 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.
@@ -15,8 +15,8 @@
import os
import logging
from nomadcore.baseclasses import ParserInterface
-from parser_vasprun import parserInfo
-from vaspmainparser import VASPMainParser
+from vaspparser.parser_vasprun import parserInfo
+from vaspparser.vaspmainparser import VASPMainParser
logger = logging.getLogger("nomad")
diff --git a/parser/parser-vasp/vaspparser/parser_vasp.py b/parser/parser-vasp/vaspparser/parser_vasp.py
index 8b9e6d0..128764e 100644
--- a/parser/parser-vasp/vaspparser/parser_vasp.py
+++ b/parser/parser-vasp/vaspparser/parser_vasp.py
@@ -1,11 +1,11 @@
# Copyright 2016-2018 Fawzi Mohamed, Lauri Himanen, Danio Brambila, Ankit Kariryaa, Henning Glawe
-#
+#
# 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.
@@ -13,7 +13,7 @@
# limitations under the License.
from builtins import object
-import setup_paths
+import vaspparser.setup_paths
from nomadcore.simple_parser import mainFunction, SimpleMatcher as SM
from nomadcore.local_meta_info import loadJsonFile, InfoKindEl
from nomadcore.caching_backend import CachingLevel
diff --git a/parser/parser-vasp/vaspparser/parser_vasprun.py b/parser/parser-vasp/vaspparser/parser_vasprun.py
index 4199dfc..b3df9e7 100644
--- a/parser/parser-vasp/vaspparser/parser_vasprun.py
+++ b/parser/parser-vasp/vaspparser/parser_vasprun.py
@@ -1,11 +1,11 @@
# Copyright 2016-2018 Fawzi Mohamed, Lauri Himanen, Danio Brambila, Ankit Kariryaa, Henning Glawe
-#
+#
# 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.
@@ -19,13 +19,12 @@ from builtins import range
from builtins import object
import xml.etree.ElementTree
import logging, sys, bisect
-import setup_paths
+import vaspparser.setup_paths
from datetime import datetime
import os, logging, re, traceback
from nomadcore.parser_backend import JsonParseEventsWriterBackend
from nomadcore.local_meta_info import loadJsonFile, InfoKindEl
import numpy as np
-import setup_paths
from nomadcore.unit_conversion.unit_conversion import convert_unit_function
from nomadcore.unit_conversion.unit_conversion import convert_unit
import ase.geometry
--
GitLab