Skip to content

Commit

Permalink
Try to remove pymatgen/monty pins
Browse files Browse the repository at this point in the history
  • Loading branch information
gmatteo committed Jan 11, 2025
1 parent 234ef4c commit 96ffcff
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion abipy/ml/extxyz_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def to_string(self, verbose: int = 0) -> str:
def __str__(self) -> str:
return self.to_string()

def write(self, xyz_filepath: PathLike, traj_range=None, overwrite: bool = False):
def write(self, xyz_filepath: PathLike, traj_range=None, overwrite: bool = False) -> None:
"""
Write data to xyz_filepath.
Expand Down
8 changes: 4 additions & 4 deletions abipy/ml/tools.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Low-level tools used in abipy.ml
Low-level tools used in abipy.ml module
"""
from __future__ import annotations

Expand Down Expand Up @@ -31,7 +31,7 @@ def get_energy_step(step: dict) -> float:

def get_structures_labels_from_file(filepath: str) -> tuple[list[Structure], dict]:
"""
Read energies, forces, stresses and magmoms from an external file.
Read energies, forces, stresses and magmoms from an external file.
Return list of structures and dict with results.
"""
basename = os.path.basename(str(filepath))
Expand Down Expand Up @@ -80,7 +80,7 @@ def get_structures_labels_from_file(filepath: str) -> tuple[list[Structure], dic

def get_structures_labels_from_files(filepaths) -> tuple[list[Structure], dict]:
"""
Read energies, forces, stresses and magmoms from an external file.
Read energies, forces, stresses and magmoms from an external file.
Return list of structures and dict with results.
"""
for i, path in enumerate(list_strings(filepaths)):
Expand All @@ -96,4 +96,4 @@ def get_structures_labels_from_files(filepaths) -> tuple[list[Structure], dict]:
#for s in structures: print(s)
#for k, v in labels.items(): print(k, v)

return structures, labels
return structures, labels
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ dependencies = [
"phonopy<=2.31.2",
"plotly",
"pydispatcher>=2.0.5",
"pymatgen",
#"pymatgen==v2024.10.29",
"monty==v2024.10.21",
#"monty==v2024.10.21",
"pymatgen",
"monty",
"pyyaml>=3.11",
"scipy",
"seaborn",
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ pandas
numpy<2.0.0
sympy
spglib
pymatgen
#pymatgen==v2024.10.29
monty==v2024.10.21
#monty==v2024.10.21
pymatgen
monty
netCDF4
matplotlib
seaborn
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,10 @@ def cleanup():
"numpy<2.0.0",
"scipy",
"spglib",
"pymatgen",
#"pymatgen==v2024.10.29",
"monty==v2024.10.21",
#"monty==v2024.10.21",
"pymatgen",
"monty",
"netCDF4",
"matplotlib",
"seaborn",
Expand Down

0 comments on commit 96ffcff

Please sign in to comment.