Merge branch 'master' into get_el_sp-isotope-unit-test

materialsproject · Jan 2, 2025 · 6f1e27a · 6f1e27a
2 parents 9e693c7 + 1abc459
commit 6f1e27a
Show file tree

Hide file tree

Showing 18 changed files with 172 additions and 477 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -107,7 +107,7 @@ optional = [
     "hiphive>=1.3.1",
     "jarvis-tools>=2020.7.14",
     "matplotlib>=3.8",
-    "phonopy>=2.23",
+    "phonopy>=2.33.3",
     "seekpath>=2.0.1",
 ]
 # tblite only support Python 3.12+ through conda-forge

diff --git a/src/pymatgen/command_line/OxideTersoffPotentials b/src/pymatgen/command_line/OxideTersoffPotentials
diff --git a/src/pymatgen/command_line/bush.lib b/src/pymatgen/command_line/bush.lib
diff --git a/src/pymatgen/command_line/critic2_caller.py b/src/pymatgen/command_line/critic2_caller.py
@@ -766,7 +766,7 @@ def get_volume_and_charge(nonequiv_idx):
     def _parse_stdout(self, stdout):
         warnings.warn(
             "Parsing critic2 standard output is deprecated and will not be maintained, "
-            "please use the native JSON output in future.",
+            "please use the native JSON output in the future.",
             DeprecationWarning,
             stacklevel=2,
         )