Fix schema reload

Author: ladinesa

src/nomad_simulation_parsers/parsers/exciting/parser.py

@@ -1,6 +1,7 @@
 import os
 from importlib import reload
 from typing import Any
+from importlib import reload
 
 import numpy as np
 from nomad.datamodel.datamodel import (
@@ -19,6 +20,7 @@
 from structlog.stdlib import (
     BoundLogger,
 )
+from nomad_simulation_parsers.schema_packages import exciting
 
 from nomad_simulation_parsers.parsers.utils.general import (
     remove_mapping_annotations,

src/nomad_simulation_parsers/parsers/vasp/outcar_parser.py

@@ -466,12 +466,6 @@ def get_xc_functionals(self, parameters: dict[str, Any]) -> list[dict[str, Any]]
 
 class OutcarArchiveWriter(ArchiveWriter):
     def write_to_archive(self) -> None:
-<<<<<<< HEAD
-=======
-        # import schema to load annotations
-        from nomad_simulation_parsers.schema_packages import vasp
-
->>>>>>> 5c4e91d (Refactor)
         # set up archive parser
         archive_data_parser = VASPMetainfoParser()
         archive_data = Simulation()
@@ -496,7 +490,3 @@ def write_to_archive(self) -> None:
         # close file handles
         archive_data_parser.close()
         source_parser.close()
-
-        # remove annotations
-        # TODO cache? put in close context
-        remove_mapping_annotations(vasp.general.Simulation.m_def)

src/nomad_simulation_parsers/parsers/vasp/xml_parser.py

@@ -11,6 +11,7 @@
 from nomad_simulations.schema_packages.general import Simulation
 
 from nomad_simulation_parsers.parsers.utils.general import remove_mapping_annotations
+from nomad_simulation_parsers.schema_packages import vasp
 
 LOGGER = get_logger(__name__)
 
@@ -81,7 +82,3 @@ def write_to_archive(self) -> None:
         # close file objects
         data_parser.close()
         xml_parser.close()
-
-        # remove annotations
-        # TODO cache? put in close context
-        remove_mapping_annotations(vasp.general.Simulation.m_def)