Merge branch 'master' into feature-jdftx-outputs

materialsproject · Jan 8, 2025 · a3c2105 · a3c2105
2 parents 32dd0f9 + e2baa68
commit a3c2105
Show file tree

Hide file tree

Showing 23 changed files with 251 additions and 562 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.1
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: [--fix, --unsafe-fixes]
@@ -22,7 +22,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.14.1
     hooks:
       - id: mypy
 
@@ -65,6 +65,6 @@ repos:
         args: [--drop-empty-cells, --keep-output]
 
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.389
+    rev: v1.1.391
     hooks:
       - id: pyright
diff --git a/docs/pymatgen.md b/docs/pymatgen.md
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,
         )