Commit 6fe2d9a5 authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Updated phonon parser to support newer ASE, fixed issues in test fixture, fixed imports.

parent 2e36dc1c
Pipeline #72452 failed with stages
in 21 minutes and 38 seconds
Subproject commit 655554d0ced95ac066813c58c94e124344ab75b7
Subproject commit eac05cd4c80498e8e6ccd8f959cc76d9e16bcb2e
# Copyright 2018 Markus Scheidgen
#
# 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.
......@@ -19,7 +19,7 @@ from nomad import processing, files
from nomad.datamodel import EntryMetadata, MongoMetadata, EntryArchive
from nomad.parsing import Backend
from tests.test_normalizing import run_normalize
from tests.normalizing.conftest import run_normalize
class Upload():
......
......@@ -29,13 +29,11 @@ import elasticsearch.exceptions
from typing import List
import json
import logging
import numpy as np
from nomad import config, infrastructure, parsing, processing, app, utils
from nomad.datamodel import User
from tests import test_parsing
from nomad.parsing.legacy import Backend
from tests.normalizing.conftest import run_normalize
from tests.processing import test_data as test_processing
from tests.test_files import example_file, empty_file
......
......@@ -44,13 +44,13 @@ def normalized_vasp_example(parsed_vasp_example: Backend) -> EntryArchive:
@pytest.fixture
def normalized_example(parsed_example: Backend) -> EntryArchive:
return run_normalize(parsed_example).entry_archive
def normalized_example(parsed_example: Backend) -> Backend:
return run_normalize(parsed_example)
@pytest.fixture
def normalized_template_example(parsed_template_example) -> EntryArchive:
return run_normalize(parsed_template_example).entry_archive
def normalized_template_example(parsed_template_example) -> Backend:
return run_normalize(parsed_template_example)
def run_normalize_for_structure(atoms: Atoms) -> EntryArchive:
......
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