From def43d50d1ef1b1051a24bebc851606f9fd4615b Mon Sep 17 00:00:00 2001 From: Lauri Himanen <lauri.himanen@gmail.com> Date: Tue, 21 Apr 2020 09:23:02 +0300 Subject: [PATCH] Reverting to version before phonon normalization. --- dependencies/python_common | 2 +- nomad/datamodel/metainfo/public.py | 1 + nomad/metainfo/encyclopedia.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies/python_common b/dependencies/python_common index f0350d256e..75a663a7e1 160000 --- a/dependencies/python_common +++ b/dependencies/python_common @@ -1 +1 @@ -Subproject commit f0350d256e6d15d9ab089f6bb0ce9c87b5c42243 +Subproject commit 75a663a7e1ba8ff13c49bcdc62bca8bdb2f2d108 diff --git a/nomad/datamodel/metainfo/public.py b/nomad/datamodel/metainfo/public.py index 9942648098..6aa0a345b7 100644 --- a/nomad/datamodel/metainfo/public.py +++ b/nomad/datamodel/metainfo/public.py @@ -4,6 +4,7 @@ from nomad.metainfo import ( # pylint: disable=unused-import MSection, MCategory, Category, Package, Quantity, Section, SubSection, SectionProxy, Reference, MEnum ) +from elasticsearch_dsl import InnerDoc from nomad.metainfo.legacy import LegacyDefinition diff --git a/nomad/metainfo/encyclopedia.py b/nomad/metainfo/encyclopedia.py index 7da971f6d6..ff3e8810e6 100644 --- a/nomad/metainfo/encyclopedia.py +++ b/nomad/metainfo/encyclopedia.py @@ -1,6 +1,6 @@ import numpy as np from elasticsearch_dsl import InnerDoc -from nomad.metainfo import MSection, Section, SubSection, Quantity, Reference, MEnum, units +from nomad.metainfo import MSection, Section, SectionProxy, SubSection, Quantity, Reference, MEnum, units from nomad.datamodel.metainfo.public import section_dos, section_k_band -- GitLab