From 0398185a95f64e0c535822832d859b98ccb5f27a Mon Sep 17 00:00:00 2001 From: Shyam D Date: Tue, 20 Oct 2020 19:11:41 -0700 Subject: [PATCH] import cleanup --- tests/conftest.py | 1 + tests/emmet-builders/test_utils.py | 5 +++-- tests/emmet-builders/test_vasp.py | 2 +- tests/emmet-core/test_settings.py | 4 ++-- tests/emmet-core/test_structuremetadata.py | 5 +++-- tests/emmet-core/test_thermo.py | 1 + tests/emmet-core/test_utils.py | 10 +++++----- tests/emmet-core/vasp/test_materials.py | 6 ++++-- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 283d31255f..1626c488fb 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ from pathlib import Path + import pytest diff --git a/tests/emmet-builders/test_utils.py b/tests/emmet-builders/test_utils.py index a401973724..b847ff43df 100644 --- a/tests/emmet-builders/test_utils.py +++ b/tests/emmet-builders/test_utils.py @@ -1,7 +1,8 @@ -from itertools import combinations, chain +from itertools import chain, combinations + from emmet.builders.utils import ( - maximal_spanning_non_intersecting_subsets, chemsys_permutations, + maximal_spanning_non_intersecting_subsets, ) diff --git a/tests/emmet-builders/test_vasp.py b/tests/emmet-builders/test_vasp.py index 4581efefd8..3348553f5f 100644 --- a/tests/emmet-builders/test_vasp.py +++ b/tests/emmet-builders/test_vasp.py @@ -1,7 +1,7 @@ import pytest from maggma.stores import JSONStore, MemoryStore -from emmet.builders.vasp.task_validator import TaskValidator +from emmet.builders.vasp.task_validator import TaskValidator intermediate_stores = ["validation"] diff --git a/tests/emmet-core/test_settings.py b/tests/emmet-core/test_settings.py index 0f8bd685ef..ad105938be 100644 --- a/tests/emmet-core/test_settings.py +++ b/tests/emmet-core/test_settings.py @@ -1,7 +1,7 @@ -import os import json -from random import random +import os from pathlib import PosixPath +from random import random from emmet.core.settings import EmmetSettings diff --git a/tests/emmet-core/test_structuremetadata.py b/tests/emmet-core/test_structuremetadata.py index 70915629d1..8959fe89a8 100644 --- a/tests/emmet-core/test_structuremetadata.py +++ b/tests/emmet-core/test_structuremetadata.py @@ -1,8 +1,9 @@ import pytest from pymatgen import Lattice -from emmet.stubs import Structure -from emmet.core.symmetry import SymmetryData, CrystalSystem + from emmet.core.structure import StructureMetadata +from emmet.core.symmetry import CrystalSystem, SymmetryData +from emmet.stubs import Structure @pytest.fixture diff --git a/tests/emmet-core/test_thermo.py b/tests/emmet-core/test_thermo.py index 28418a9657..6e86b59cbe 100644 --- a/tests/emmet-core/test_thermo.py +++ b/tests/emmet-core/test_thermo.py @@ -1,6 +1,7 @@ import pytest from monty.serialization import MontyDecoder from pymatgen.entries.entry_tools import EntrySet + from emmet.core.thermo import ThermoDoc diff --git a/tests/emmet-core/test_utils.py b/tests/emmet-core/test_utils.py index b56adcf90d..100d495783 100644 --- a/tests/emmet-core/test_utils.py +++ b/tests/emmet-core/test_utils.py @@ -1,14 +1,14 @@ +import datetime +import json import os import unittest -import numpy as np -import json -import datetime -from bson.objectid import ObjectId from enum import Enum +import numpy as np +import pytest +from bson.objectid import ObjectId from monty.json import MSONable -import pytest from emmet.core.utils import get_sg, group_structures, jsanitize diff --git a/tests/emmet-core/vasp/test_materials.py b/tests/emmet-core/vasp/test_materials.py index d53a8665c7..9dfceca47d 100644 --- a/tests/emmet-core/vasp/test_materials.py +++ b/tests/emmet-core/vasp/test_materials.py @@ -1,9 +1,11 @@ -import pytest import json + +import pytest from monty.io import zopen + +from emmet.core.vasp.calc_types import TaskType from emmet.core.vasp.material import MaterialsDoc from emmet.core.vasp.task import TaskDocument -from emmet.core.vasp.calc_types import TaskType @pytest.fixture