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.

Sign up for GitHub

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

Jump to bottom

gh-384: rename all internal functions to trapezoid over trapz #392

Merged
merged 191 commits into from
Nov 20, 2024
Merged

gh-384: rename all internal functions to trapezoid over trapz #392

merged 191 commits into from
Nov 20, 2024

Conversation

paddyroddy
Copy link
Member

Closes #384. Blocked by #391.

Keeping in line with NumPy v2 renaming np.trap to np.trapezoid. It was agreed to change the internal name of functions to avoid potential confusion.

@paddyroddy
gh-280: add mypy pre-commit hook
4ba78c1
@paddyroddy
Add scientific Python recommended config
b23ded0
@paddyroddy
Ignore npt.NDArray without specified type
b9ee0eb
@paddyroddy
Merge branch 'main' into paddy/issue-280
3f80029
@paddyroddy
Merge branch 'main' into paddy/issue-280
79f1ac3
@paddyroddy
Add more ignore[type-arg]
3856aa9
@paddyroddy
Add None return type for tests
58696dc
@paddyroddy
Add types from docstrings
d22891e
@paddyroddy
Add rng type
e6c8f77
@paddyroddy
Merge branch 'main' into paddy/issue-280
ef1c0d9
@paddyroddy
Add other rng
f53ffc5
@paddyroddy
Switch from NDArray to ArrayLke
46c75e9
@paddyroddy
Add typing to array
cdc4312
@paddyroddy
Add types to user
6e456e8
@paddyroddy
Add points typing
5b3a94c
@paddyroddy
Typing for shells
ec53ba5
@paddyroddy
Add more typing
e59a5fa
@paddyroddy
Turn off decorator warnings
d4e5396
@paddyroddy
Add return types
a2a1a5f
@paddyroddy
More typing
c2c145b
@paddyroddy
Run mypy_clean_slate
b28be77
@paddyroddy
More fixing
9151d81
@paddyroddy
mypy passes
cc07ade
@paddyroddy
Add space
6883e1c
@paddyroddy
Merge branch 'main' into paddy/issue-280
c11e82f
@paddyroddy
Fix mypy
3d894b4
@paddyroddy
Fix mypy
12ad51a
@paddyroddy
Fix linting
5bf6a27
@paddyroddy
Separate out all typing imports
aab5b92
@paddyroddy
Using typing.Any throughout
0ff8b08
@paddyroddy paddyroddy mentioned this pull request Nov 15, 2024
Merged
Base automatically changed from paddy/issue-163 to main November 18, 2024 09:24
@paddyroddy paddyroddy removed the blocked The issue or pull request is blocked by something label Nov 18, 2024
ntessore
ntessore reviewed Nov 19, 2024
View reviewed changes
Copy link
Collaborator

@ntessore ntessore left a comment

Choose a reason for hiding this comment

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

Maybe better to carry on agreeing with the scipy name, i.e., now cumulative_trapezoid?

@paddyroddy
Copy link
Member Author

Maybe better to carry on agreeing with the scipy name, i.e., now cumulative_trapezoid?

Sure. cumtrapezoid without the _ does seem a bit ugly.

Saransh-cpp
Saransh-cpp requested changes Nov 20, 2024
View reviewed changes
Copy link
Member

@Saransh-cpp Saransh-cpp left a comment

Choose a reason for hiding this comment

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

This, @paddyroddy! Could you fix the git history?

@paddyroddy
Copy link
Member Author

This, @paddyroddy! Could you fix the git history?

We're squash merging... I don't see the benefit

@paddyroddy
Copy link
Member Author

This, @paddyroddy! Could you fix the git history?

For reference, this happened because the head was #391. I do think tidying this is a waste of dev time with squash merging enabled.

Saransh-cpp
Saransh-cpp approved these changes Nov 20, 2024
View reviewed changes
Copy link
Member

@Saransh-cpp Saransh-cpp left a comment

Choose a reason for hiding this comment

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

Fair enough, everything should be fine as long as the commit message of the squashed commit does not reflect this history.

ntessore
ntessore approved these changes Nov 20, 2024
View reviewed changes
Copy link
Collaborator

@ntessore ntessore left a comment

Choose a reason for hiding this comment

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

Nice, thanks!

I just realised that I thought we were testing the cumulative trapezoid by chopping the array down to 1, 2, 3, ... elements, not scipy. Maybe a change for the future to get rid of that dependency.

@paddyroddy paddyroddy mentioned this pull request Nov 20, 2024
Closed
@paddyroddy paddyroddy merged commit 15e6847 into main Nov 20, 2024
16 checks passed
@paddyroddy paddyroddy deleted the paddy/issue-384 branch November 20, 2024 14:17
Saransh-cpp pushed a commit that referenced this pull request Nov 26, 2024
@paddyroddy @pre-commit-ci @Saransh-cpp
gh-384: rename all internal functions to trapezoid over trapz (#392)
150398f 
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
Reviewers

@ntessore ntessore ntessore approved these changes

@Saransh-cpp Saransh-cpp Saransh-cpp approved these changes

Assignees

@paddyroddy paddyroddy

Labels
api An (incompatible) API change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Change all functions with trapz in the name to trapezoid in line with NumPy v2
3 participants
@paddyroddy @ntessore @Saransh-cpp