diff --git a/emmet-core/emmet/core/material_property.py b/emmet-core/emmet/core/material_property.py index 25c3dc4487..147ba5d085 100644 --- a/emmet-core/emmet/core/material_property.py +++ b/emmet-core/emmet/core/material_property.py @@ -8,11 +8,10 @@ from pydantic import BaseModel, Field, create_model from pymatgen.analysis.magnetism import CollinearMagneticStructureAnalyzer, Ordering -from emmet.core.structure import StructureMetadata from emmet.core.material import PropertyOrigin +from emmet.core.structure import StructureMetadata from emmet.stubs import Structure - S = TypeVar("S", bound="PropertyDoc") diff --git a/emmet-core/emmet/core/vasp/calc_types/__init__.py b/emmet-core/emmet/core/vasp/calc_types/__init__.py index 38f00c5ed3..7603786d66 100644 --- a/emmet-core/emmet/core/vasp/calc_types/__init__.py +++ b/emmet-core/emmet/core/vasp/calc_types/__init__.py @@ -5,5 +5,5 @@ except ImportError: import emmet.core.vasp.calc_types.generate -from emmet.core.vasp.calc_types.enums import RunType, TaskType, CalcType -from emmet.core.vasp.calc_types.utils import run_type, task_type, calc_type +from emmet.core.vasp.calc_types.enums import CalcType, RunType, TaskType +from emmet.core.vasp.calc_types.utils import calc_type, run_type, task_type diff --git a/emmet-core/emmet/core/vasp/calc_types/utils.py b/emmet-core/emmet/core/vasp/calc_types/utils.py index 2fc71cee5e..e13493e804 100644 --- a/emmet-core/emmet/core/vasp/calc_types/utils.py +++ b/emmet-core/emmet/core/vasp/calc_types/utils.py @@ -14,7 +14,7 @@ from typing_extensions import Literal from emmet.core import SETTINGS -from emmet.core.vasp.calc_types.enums import RunType, TaskType, CalcType +from emmet.core.vasp.calc_types.enums import CalcType, RunType, TaskType _RUN_TYPE_DATA = loadfn(str(Path(__file__).parent.joinpath("run_types.yaml").resolve())) diff --git a/emmet-core/emmet/stubs/__init__.py b/emmet-core/emmet/stubs/__init__.py index 51ed42ac8e..300be3f1b0 100644 --- a/emmet-core/emmet/stubs/__init__.py +++ b/emmet-core/emmet/stubs/__init__.py @@ -4,18 +4,18 @@ """ +from pymatgen.analysis.diffraction.xrd import DiffractionPattern from pymatgen.analysis.xas.spectrum import XAS -from pymatgen.core.structure import Composition, Structure, Lattice +from pymatgen.core.structure import Composition, Lattice, Structure from pymatgen.entries.computed_entries import ComputedEntry -from pymatgen.analysis.diffraction.xrd import DiffractionPattern from emmet.stubs.math import Matrix3D, Vector3D from emmet.stubs.misc import Composition as StubComposition from emmet.stubs.misc import ComputedEntry as StubComputedEntry -from emmet.stubs.structure import Structure as StubStructure from emmet.stubs.structure import Lattice as StubLattice -from emmet.stubs.xrd import XRDPattern +from emmet.stubs.structure import Structure as StubStructure from emmet.stubs.utils import patch_msonable, use_model +from emmet.stubs.xrd import XRDPattern """ The stub names are kept in sync with the actual classes so they @@ -27,6 +27,7 @@ use_model(Composition, StubComposition, add_monty=False) use_model(ComputedEntry, StubComputedEntry) use_model(DiffractionPattern, XRDPattern) + # This is after the main block since it depends on that from emmet.stubs.xas import XASSpectrum # noqa diff --git a/tests/emmet-core/test_structuremetadata.py b/tests/emmet-core/test_structuremetadata.py index 6735c957b6..9854ff163c 100644 --- a/tests/emmet-core/test_structuremetadata.py +++ b/tests/emmet-core/test_structuremetadata.py @@ -1,5 +1,5 @@ import pytest -from pymatgen import Lattice, Element +from pymatgen import Element, Lattice from emmet.core.structure import StructureMetadata from emmet.core.symmetry import CrystalSystem, SymmetryData diff --git a/tests/emmet-core/test_utils.py b/tests/emmet-core/test_utils.py index 868d5c4292..30c8cb4209 100644 --- a/tests/emmet-core/test_utils.py +++ b/tests/emmet-core/test_utils.py @@ -3,13 +3,12 @@ import os import unittest - import numpy as np import pytest from bson.objectid import ObjectId from monty.json import MSONable -from emmet.core.utils import get_sg, group_structures, jsanitize, ValueEnum, DocEnum +from emmet.core.utils import DocEnum, ValueEnum, get_sg, group_structures, jsanitize def test_jsanitize():