Skip to content

Commit

Permalink
imports cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
shyamd committed Oct 16, 2020
1 parent aa9009b commit ba879e8
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion emmet-core/emmet/core/material.py
@@ -1,7 +1,7 @@
""" Core definition of a Materials Document """
from datetime import datetime
from functools import partial
from typing import ClassVar, Optional, Union, Sequence, Mapping
from typing import ClassVar, Mapping, Optional, Sequence, Union

from pydantic import BaseModel, Field, create_model
from pymatgen.analysis.magnetism import CollinearMagneticStructureAnalyzer, Ordering
Expand Down
5 changes: 4 additions & 1 deletion emmet-core/emmet/core/utils.py
Expand Up @@ -9,8 +9,8 @@
from monty.json import MSONable
from monty.serialization import loadfn
from pydantic import BaseModel
from pymatgen.core.structure import Structure
from pymatgen.analysis.structure_matcher import ElementComparator, StructureMatcher
from pymatgen.core.structure import Structure
from typing_extensions import Literal

from emmet.core import SETTINGS
Expand Down Expand Up @@ -123,3 +123,6 @@ def jsanitize(obj, strict=False, allow_bson=False):
return obj.__str__()

return jsanitize(obj.as_dict(), strict=strict, allow_bson=allow_bson)



2 changes: 1 addition & 1 deletion emmet-core/emmet/core/vasp/__init__.py
@@ -1,4 +1,4 @@
from emmet.core.vasp.calc_types import CalcType, RunType, TaskType
from emmet.core.vasp.material import MaterialsDoc
from emmet.core.vasp.validation import ValidationDoc
from emmet.core.vasp.task import TaskDocument, VASPObjects
from emmet.core.vasp.validation import ValidationDoc
2 changes: 1 addition & 1 deletion emmet-core/emmet/core/vasp/calc_types.py
Expand Up @@ -10,8 +10,8 @@
from monty.json import MSONable
from monty.serialization import loadfn
from pydantic import BaseModel
from pymatgen.core.structure import Structure
from pymatgen.analysis.structure_matcher import ElementComparator, StructureMatcher
from pymatgen.core.structure import Structure
from typing_extensions import Literal

from emmet.core import SETTINGS
Expand Down
10 changes: 4 additions & 6 deletions emmet-core/emmet/core/vasp/task.py
@@ -1,25 +1,23 @@
""" Core definition of a VASP Task Document """
from datetime import datetime
from enum import Enum
from functools import partial, cached_property
from functools import cached_property, partial
from typing import ClassVar, Dict, List, Optional, Union

from pydantic import BaseModel, Field, create_model
from pymatgen.analysis.magnetism import CollinearMagneticStructureAnalyzer, Ordering
from pymatgen.analysis.structure_analyzer import oxide_type

from emmet.core.structure import StructureMetadata
from emmet.stubs import Matrix3D, Structure
from emmet.core.vasp.calc_types import (
CalcType,
TaskType,
RunType,
TaskType,
calc_type,
run_type,
task_type,
calc_type,
)

from emmet.stubs import ComputedEntry
from emmet.stubs import ComputedEntry, Matrix3D, Structure


class Status(Enum):
Expand Down
4 changes: 2 additions & 2 deletions emmet-core/emmet/core/vasp/task2.py
Expand Up @@ -2,13 +2,13 @@
from datetime import datetime
from enum import Enum
from functools import partial
from typing import ClassVar, Dict, List, Optional, Union, Any
from typing import Any, ClassVar, Dict, List, Optional, Union

from pydantic import BaseModel, Field, create_model
from pymatgen.analysis.magnetism import CollinearMagneticStructureAnalyzer, Ordering

from emmet.core.structure import StructureMetadata
from emmet.stubs import Matrix3D, Structure, ComputedEntry
from emmet.stubs import ComputedEntry, Matrix3D, Structure


class Status(Enum):
Expand Down
1 change: 1 addition & 0 deletions emmet-core/emmet/core/vasp/validation.py
@@ -1,6 +1,7 @@
from datetime import datetime
from enum import Enum
from typing import List, Union

from pydantic import BaseModel, Field


Expand Down
2 changes: 1 addition & 1 deletion emmet-core/emmet/stubs/__init__.py
Expand Up @@ -4,8 +4,8 @@
"""

from pymatgen.core.structure import Composition, Structure
from pymatgen.analysis.xas.spectrum import XAS
from pymatgen.core.structure import Composition, Structure
from pymatgen.entries.computed_entries import ComputedEntry

from emmet.stubs.math import Matrix3D, Vector3D
Expand Down

0 comments on commit ba879e8

Please sign in to comment.