Merge branch 'main' into patch-8

materialsvirtuallab · Aug 30, 2024 · 1e7dc4c · 1e7dc4c
2 parents 9127d7f + e0b851f
commit 1e7dc4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,11 +35,11 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Physics",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-dependencies = ["ase>=3.23.0", "joblib", "phonopy", "pymatgen"]
+dependencies = ["ase>=3.23.0", "joblib", "phonopy", "pymatgen", "numpy<2.0.0"]
 version = "0.0.4"
 
 [project.optional-dependencies]
-models = ["chgnet>=0.3.8", "mace-torch>=0.3.6", "matgl>=0.9.0", "sevenn>=0.9.3"]
+models = ["chgnet>=0.3.8", "mace-torch>=0.3.6", "matgl>=1.0.0", "sevenn>=0.9.3", "dgl<=2.1.0", "torch<=2.2.1"]
 
 [tool.setuptools]
 packages = ["matcalc"]

diff --git a/requirements.txt b/requirements.txt
@@ -4,3 +4,4 @@ joblib==1.3.1
 phonopy==2.20.0
 scikit-learn>=1.3.0
 seekpath==2.1.0
+numpy==1.26.4