Skip to content

Commit

Permalink
Merge pull request #1466 from pyiron/scipy-1
Browse files Browse the repository at this point in the history
Update scipy to 1.14.0
  • Loading branch information
jan-janssen committed Jun 26, 2024
2 parents 4736bdc + 194f7e7 commit c5c54a2
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- myst-parser
- aimsgb =1.1.0
- ase =3.23.0
- atomistics =0.1.29
- atomistics =0.1.30
- defusedxml =0.7.1
- h5py =3.11.0
- matplotlib-base =3.8.4
Expand All @@ -19,12 +19,12 @@ dependencies:
- pint =0.24
- pyiron_base =0.9.4
- pyiron_snippets =0.1.2
- pylammpsmpi =0.2.19
- pylammpsmpi =0.2.20
- pyscal =2.10.18
- scikit-learn =1.5.0
- scipy =1.13.1
- scipy =1.14.0
- seekpath =2.1.0
- spglib =2.4.0
- structuretoolkit =0.0.25
- structuretoolkit =0.0.26
- pyxtal =0.6.2
- jupyter-book =1.0.0
8 changes: 4 additions & 4 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
dependencies:
- aimsgb =1.1.0
- ase =3.23.0
- atomistics =0.1.29
- atomistics =0.1.30
- coverage
- codacy-coverage
- defusedxml =0.7.1
Expand All @@ -17,11 +17,11 @@ dependencies:
- pint =0.24
- pyiron_base =0.9.4
- pyiron_snippets =0.1.2
- pylammpsmpi =0.2.19
- pylammpsmpi =0.2.20
- pyscal =2.10.18
- scikit-learn =1.5.0
- scipy =1.13.1
- scipy =1.14.0
- seekpath =2.1.0
- spglib =2.4.0
- structuretoolkit =0.0.25
- structuretoolkit =0.0.26
- pyxtal =0.6.2
8 changes: 4 additions & 4 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
dependencies:
- aimsgb =1.1.0
- ase =3.23.0
- atomistics =0.1.29
- atomistics =0.1.30
- defusedxml =0.7.1
- h5py =3.11.0
- matplotlib-base =3.8.4
Expand All @@ -15,13 +15,13 @@ dependencies:
- pint =0.24
- pyiron_base =0.9.4
- pyiron_snippets =0.1.2
- pylammpsmpi =0.2.19
- pylammpsmpi =0.2.20
- pyscal =2.10.18
- scikit-learn =1.5.0
- scipy =1.13.1
- scipy =1.14.0
- seekpath =2.1.0
- spglib =2.4.0
- structuretoolkit =0.0.25
- structuretoolkit =0.0.26
- pyxtal =0.6.2
- pyiron-data >=0.0.22
- sqsgenerator
Expand Down
4 changes: 2 additions & 2 deletions pyiron_atomistics/vasp/parser/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Distributed under the terms of "New BSD License", see the LICENSE file.

import numpy as np
from scipy.integrate import cumtrapz
from scipy.integrate import cumulative_trapezoid

__author__ = "Sudarsan Surendralal"
__copyright__ = (
Expand Down Expand Up @@ -43,7 +43,7 @@ def from_file(self, filename="REPORT"):
]
rel_lines = [lines[i] for i, line in enumerate(lines) if "cc>" in line]
cv = np.genfromtxt(rel_lines, usecols=[2])
fe = cumtrapz(lam, cv)
fe = cumulative_trapezoid(lam, cv)
self.parse_dict["cv_full"] = cv
self.parse_dict["derivative"] = lam
self.parse_dict["cv"] = cv[:-1]
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ classifiers = [
]
dependencies = [
"ase==3.23.0",
"atomistics==0.1.29",
"atomistics==0.1.30",
"defusedxml==0.7.1",
"h5py==3.11.0",
"matplotlib==3.8.4",
Expand All @@ -37,12 +37,12 @@ dependencies = [
"pint==0.24",
"pyiron_base==0.9.4",
"pyiron_snippets==0.1.2",
"pylammpsmpi==0.2.19",
"scipy==1.13.1",
"pylammpsmpi==0.2.20",
"scipy==1.14.0",
"scikit-learn==1.5.0",
"seekpath==2.1.0",
"spglib==2.4.0",
"structuretoolkit==0.0.25",
"structuretoolkit==0.0.26",
]
dynamic = ["version"]

Expand Down

0 comments on commit c5c54a2

Please sign in to comment.