gh-480: fix mypy failures #490
Merged
+18
−18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Saransh-cpp
commented
Jan 28, 2025
| @@ -166,7 +166,7 @@ def trapezoid_product( | |||
| y = np.interp(x, *f) | |||
| for f_ in ff: | |||
| y *= np.interp(x, *f_) | |||
| return np.trapezoid(y, x, axis=axis) # type: ignore[return-value] | |||
| return np.trapezoid(y, x, axis=axis) | |||
There was a problem hiding this comment.
The failing ignore[return-value] checks were on numpy 2.2.0, and should be resolved now.
| @@ -52,7 +52,7 @@ def effective_bias( | |||
| z: npt.NDArray[np.float64], | |||
| bz: npt.NDArray[np.float64], | |||
| w: RadialWindow, | |||
| ) -> npt.NDArray[np.float64]: | |||
| ) -> float | npt.NDArray[np.double]: | |||
There was a problem hiding this comment.
np.trapezoidcan return afloat- Division between
np.float64andnp.float64can result innp.double("float-any") for some reason.
| @@ -742,7 +742,7 @@ def _uniform_grid( | |||
| if step is not None and num is None: | |||
| return np.arange(start, np.nextafter(stop + step, stop), step) | |||
| if step is None and num is not None: | |||
| return np.linspace(start, stop, num + 1) # type: ignore[return-value] | |||
| return np.linspace(start, stop, num + 1, dtype=np.float64) | |||
There was a problem hiding this comment.
Returns "float-any" so be explicit about the type
| z = np.linspace(zmin, zmax, n) | ||
| w = wht(z) # type: ignore[arg-type] | ||
| z = np.linspace(zmin, zmax, n, dtype=np.float64) | ||
| w = wht(z) | ||
| zeff = np.trapezoid(w * z, z) / np.trapezoid(w, z) |
There was a problem hiding this comment.
np.trapezoid can return an array and I don't think they have enough overloads in place -- therefore zeff can be an array and the type signature of RadialWindow should reflect this
| @@ -442,7 +442,7 @@ def add_window(self, delta: npt.NDArray[np.float64], w: RadialWindow) -> None: | |||
| def add_plane( | |||
| self, | |||
| delta: npt.NDArray[np.float64], | |||
| zsrc: float, | |||
| zsrc: float | npt.NDArray[np.float64], | |||
There was a problem hiding this comment.
If zeff can be an array, zsrc in add_window can be one too, and add_window passes zsrc to add_plane
Comment on lines
+413
to
+414
| self.z2: float | npt.NDArray[np.float64] = 0.0 | ||
| self.z3: float | npt.NDArray[np.float64] = 0.0 |
There was a problem hiding this comment.
Because of zsrc's new type signature
ntessore
approved these changes
Jan 31, 2025
|
Merging this to unblock other PRs' tests. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes most of the errors. See my comments below for a better explanation.
Refs: #480
Changelog entry
Checks