Changes to be compatible with new pymatgen

Author: espottesmith

atomate/utils/testing.py

@@ -10,7 +10,7 @@
 from fireworks import LaunchPad
 from pymongo import MongoClient
 
-from pymatgen.settings import SETTINGS
+from pymatgen.core import SETTINGS
 
 __author__ = "Kiran Mathew"
 __credits__ = "Anubhav Jain"

atomate/utils/utils.py

@@ -11,7 +11,7 @@
 from pymongo import MongoClient
 from monty.json import MontyDecoder
 from monty.serialization import loadfn
-from pymatgen import Composition
+from pymatgen.core.composition import Composition
 
 from fireworks import Workflow
 from pymatgen.alchemy.materials import TransformedStructure

atomate/vasp/firetasks/exchange.py

@@ -8,7 +8,7 @@
 from datetime import datetime
 import numpy as np
 
-from pymatgen import Structure
+from pymatgen.core.structure import Structure
 from pymatgen.command_line.bader_caller import bader_analysis_from_path
 from pymatgen.analysis.magnetism.heisenberg import HeisenbergMapper, HeisenbergModel
 from pymatgen.analysis.magnetism import CollinearMagneticStructureAnalyzer, Ordering

atomate/vasp/firetasks/glue_tasks.py

@@ -17,7 +17,7 @@
 import os
 import re
 
-from pymatgen import MPRester
+from pymatgen.ext.matproj import MPRester
 from pymatgen.io.vasp.sets import get_vasprun_outcar
 from pymatgen.core.structure import Structure
 

atomate/vasp/firetasks/parse_outputs.py

@@ -16,7 +16,7 @@
 from fireworks import FiretaskBase, FWAction, explicit_serialize
 from fireworks.utilities.fw_serializers import DATETIME_HANDLER
 
-from pymatgen import Structure
+from pymatgen.core.structure import Structure
 from pymatgen.analysis.elasticity.elastic import ElasticTensor, ElasticTensorExpansion
 from pymatgen.analysis.elasticity.strain import Strain, Deformation
 from pymatgen.analysis.elasticity.stress import Stress

atomate/vasp/firetasks/tests/test_exchange.py

@@ -20,7 +20,7 @@
 
 from atomate.utils.testing import AtomateTest
 
-from pymatgen import Structure
+from pymatgen.core.structure import Structure
 from pymatgen.util.testing import PymatgenTest
 from pymatgen.io.vasp import Incar, Poscar, Potcar, Kpoints
 from pymatgen.io.vasp.sets import MPRelaxSet

atomate/vasp/firetasks/tests/test_polarization_to_db.py

@@ -17,7 +17,7 @@
 from atomate.vasp.powerups import use_fake_vasp
 from atomate.vasp.firetasks.parse_outputs import PolarizationToDb
 
-from pymatgen.settings import SETTINGS
+from pymatgen.core import SETTINGS
 
 __author__ = 'Tess Smidt'
 __email__ = '[email protected]'

atomate/vasp/powerups.py

@@ -20,7 +20,7 @@
 from fireworks import Workflow, FileWriteTask
 from fireworks.core.firework import Tracker
 from fireworks.utilities.fw_utilities import get_slug
-from pymatgen import Structure
+from pymatgen.core.structure import Structure
 
 __author__ = "Anubhav Jain, Kiran Mathew, Alex Ganose"
 __email__ = "[email protected], [email protected]"