Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update coordination_number_calculation.py #608

Merged
merged 2 commits into from
Nov 8, 2024

Conversation

alvarovm
Copy link
Contributor

@alvarovm alvarovm commented Nov 8, 2024

replace cumtrapz for cumulative_trapezoid

Solving:
ImportError: cannot import name 'cumtrapz' from 'scipy.integrate' (/avazquez/my-venv/lib/python3.11/site-packages/scipy/integrate/init.py)

cumtrapz is not present in 1.4.1 scipy see https://github.com/scipy/scipy/tree/v1.4.1/scipy/integrate

alvarovm and others added 2 commits November 8, 2024 01:27
Copy link
Member

@SamTov SamTov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, this looks great. Thanks for dusting off the cobwebs and making a PR here. As soon as the tests go through I will be happy to merge.

@SamTov SamTov changed the base branch from main to SamTov-patch-1 November 8, 2024 07:53
@SamTov SamTov merged commit 1d58ce4 into zincware:SamTov-patch-1 Nov 8, 2024
3 checks passed
SamTov added a commit that referenced this pull request Nov 11, 2024
* Update pytest.yml

* Update coordination_number_calculation.py (#608)

* Update coordination_number_calculation.py

replace cumtrapz for cumulative_trapezoid

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Update requirements.txt

* Update green_kubo_ionic_conductivity.py

* Update green_kubo_self_diffusion_coefficients.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update kirkwood_buff_integrals.py

* Update setup.py

* Update dev-requirements.txt

---------

Co-authored-by: Alvaro Vazquez-Mayagoitia <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants