Fix imports.

Author: shyuep

tests/core/test_bond_valence.py

@@ -3,8 +3,8 @@
 import pytest
 from pytest import approx
 
-from pymatgen.analysis.bond_valence import BVAnalyzer, calculate_bv_sum, calculate_bv_sum_unordered
 from pymatgen.core import Composition, Species, Structure
+from pymatgen.core.bond_valence import BVAnalyzer, calculate_bv_sum, calculate_bv_sum_unordered
 from pymatgen.util.testing import TEST_FILES_DIR, MatSciTest
 
 TEST_DIR = f"{TEST_FILES_DIR}/core/bond_valence"

tests/core/test_local_env.py

@@ -8,8 +8,9 @@
 from numpy.testing import assert_allclose
 from pytest import approx
 
-from pymatgen.analysis.graphs import MoleculeGraph, StructureGraph
-from pymatgen.analysis.local_env import (
+from pymatgen.core import Element, Lattice, Molecule, Structure
+from pymatgen.core.graphs import MoleculeGraph, StructureGraph
+from pymatgen.core.local_env import (
     CN_OPT_PARAMS,
     DEFAULT_OP_PARAMS,
     BrunnerNNReal,
@@ -39,7 +40,6 @@
     site_is_of_motif_type,
     solid_angle,
 )
-from pymatgen.core import Element, Lattice, Molecule, Structure
 from pymatgen.util.testing import TEST_FILES_DIR, MatSciTest
 
 TEST_DIR = f"{TEST_FILES_DIR}/analysis/local_env/fragmenter_files"

tests/core/test_structure_matcher.py

@@ -8,19 +8,19 @@
 from numpy.testing import assert_allclose
 from pytest import approx
 
-from pymatgen.analysis.structure_matcher import (
+from pymatgen.core import Element, Lattice, Structure, SymmOp
+from pymatgen.core.structure_matcher import (
     ElementComparator,
     FrameworkComparator,
     OccupancyComparator,
     OrderDisorderElementComparator,
     StructureMatcher,
     get_linear_assignment_solution,
 )
-from pymatgen.core import Element, Lattice, Structure, SymmOp
 from pymatgen.util.coord import find_in_coord_list_pbc
 from pymatgen.util.testing import TEST_FILES_DIR, VASP_IN_DIR, MatSciTest
 
-TEST_DIR = f"{TEST_FILES_DIR}/analysis/structure_matcher"
+TEST_DIR = f"{TEST_FILES_DIR}/core/structure_matcher"
 
 
 class TestLinearAssignment: