move structures out of util dir

materialsproject · May 15, 2024 · e6e2301 · e6e2301
1 parent 40b0165
commit e6e2301
Show file tree

Hide file tree

Showing 22 changed files with 1 addition and 2 deletions.
diff --git a/pymatgen/util/testing/__init__.py b/pymatgen/util/testing/__init__.py
@@ -24,9 +24,8 @@
     from collections.abc import Sequence
     from typing import Any, ClassVar
 
-MODULE_DIR = Path(__file__).absolute().parent
-STRUCTURES_DIR = MODULE_DIR / ".." / "structures"
 TEST_FILES_DIR = Path(SETTINGS.get("PMG_TEST_FILES_DIR", f"{ROOT}/tests/files"))
+STRUCTURES_DIR = TEST_FILES_DIR / "structures"
 VASP_IN_DIR = f"{TEST_FILES_DIR}/io/vasp/inputs"
 VASP_OUT_DIR = f"{TEST_FILES_DIR}/io/vasp/outputs"
 # fake POTCARs have original header information, meaning properties like number of electrons,

diff --git a/pymatgen/util/structures/BaNiO3.json → tests/files/structures/BaNiO3.json b/pymatgen/util/structures/BaNiO3.json → tests/files/structures/BaNiO3.json
diff --git a/pymatgen/util/structures/CsCl.json → tests/files/structures/CsCl.json b/pymatgen/util/structures/CsCl.json → tests/files/structures/CsCl.json
diff --git a/pymatgen/util/structures/Graphite.json → tests/files/structures/Graphite.json b/pymatgen/util/structures/Graphite.json → tests/files/structures/Graphite.json
diff --git a/pymatgen/util/structures/He_BCC.json → tests/files/structures/He_BCC.json b/pymatgen/util/structures/He_BCC.json → tests/files/structures/He_BCC.json
diff --git a/pymatgen/util/structures/K2O2.json → tests/files/structures/K2O2.json b/pymatgen/util/structures/K2O2.json → tests/files/structures/K2O2.json
diff --git a/pymatgen/util/structures/La2CoO4F.json → tests/files/structures/La2CoO4F.json b/pymatgen/util/structures/La2CoO4F.json → tests/files/structures/La2CoO4F.json
diff --git a/pymatgen/util/structures/Li10GeP2S12.json → tests/files/structures/Li10GeP2S12.json b/pymatgen/util/structures/Li10GeP2S12.json → tests/files/structures/Li10GeP2S12.json
diff --git a/pymatgen/util/structures/Li2O.json → tests/files/structures/Li2O.json b/pymatgen/util/structures/Li2O.json → tests/files/structures/Li2O.json
diff --git a/pymatgen/util/structures/Li2O2.json → tests/files/structures/Li2O2.json b/pymatgen/util/structures/Li2O2.json → tests/files/structures/Li2O2.json
diff --git a/pymatgen/util/structures/Li3V2(PO4)3.json → tests/files/structures/Li3V2(PO4)3.json b/pymatgen/util/structures/Li3V2(PO4)3.json → tests/files/structures/Li3V2(PO4)3.json
diff --git a/pymatgen/util/structures/LiFePO4.json → tests/files/structures/LiFePO4.json b/pymatgen/util/structures/LiFePO4.json → tests/files/structures/LiFePO4.json
diff --git a/pymatgen/util/structures/NaFePO4.json → tests/files/structures/NaFePO4.json b/pymatgen/util/structures/NaFePO4.json → tests/files/structures/NaFePO4.json
diff --git a/pymatgen/util/structures/Pb2TiZrO6.json → tests/files/structures/Pb2TiZrO6.json b/pymatgen/util/structures/Pb2TiZrO6.json → tests/files/structures/Pb2TiZrO6.json
diff --git a/pymatgen/util/structures/Si.json → tests/files/structures/Si.json b/pymatgen/util/structures/Si.json → tests/files/structures/Si.json
diff --git a/pymatgen/util/structures/SiO2.json → tests/files/structures/SiO2.json b/pymatgen/util/structures/SiO2.json → tests/files/structures/SiO2.json
diff --git a/...en/util/structures/Si_SiO2_Interface.json → ...s/files/structures/Si_SiO2_Interface.json b/...en/util/structures/Si_SiO2_Interface.json → ...s/files/structures/Si_SiO2_Interface.json
diff --git a/pymatgen/util/structures/Sn.json → tests/files/structures/Sn.json b/pymatgen/util/structures/Sn.json → tests/files/structures/Sn.json
diff --git a/pymatgen/util/structures/SrTiO3.json → tests/files/structures/SrTiO3.json b/pymatgen/util/structures/SrTiO3.json → tests/files/structures/SrTiO3.json
diff --git a/pymatgen/util/structures/TiO2.json → tests/files/structures/TiO2.json b/pymatgen/util/structures/TiO2.json → tests/files/structures/TiO2.json
diff --git a/pymatgen/util/structures/TlBiSe2.json → tests/files/structures/TlBiSe2.json b/pymatgen/util/structures/TlBiSe2.json → tests/files/structures/TlBiSe2.json
diff --git a/pymatgen/util/structures/VO2.json → tests/files/structures/VO2.json b/pymatgen/util/structures/VO2.json → tests/files/structures/VO2.json