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

Tests for where overrides in __array_ufunc__ #14596

Merged
merged 2 commits into from Mar 28, 2023

Conversation

mhvk
Copy link
Contributor

@mhvk mhvk commented Mar 28, 2023

This pull request is a short follow-up on #14590 to add (1) a test for Quantity that if one passes a quantity in where, it will raise a TypeError (in numpy >=1.25; before the unit is simply ignored); and (2) increase coverage for np.fix with an out argument.

cc @byrdie, @pllim

@github-actions
Copy link

Thank you for your contribution to Astropy! 🌌 This checklist is meant to remind the package maintainers who will review this pull request of some common things to look for.

  • Do the proposed changes actually accomplish desired goals?
  • Do the proposed changes follow the Astropy coding guidelines?
  • Are tests added/updated as required? If so, do they follow the Astropy testing guidelines?
  • Are docs added/updated as required? If so, do they follow the Astropy documentation guidelines?
  • Is rebase and/or squash necessary? If so, please provide the author with appropriate instructions. Also see "When to rebase and squash commits".
  • Did the CI pass? If no, are the failures related? If you need to run daily and weekly cron jobs as part of the PR, please apply the "Extra CI" label. Codestyle issues can be fixed by the bot.
  • Is a change log needed? If yes, did the change log check pass? If no, add the "no-changelog-entry-needed" label. If this is a manual backport, use the "skip-changelog-checks" label unless special changelog handling is necessary.
  • Is this a big PR that makes a "What's new?" entry worthwhile and if so, is (1) a "what's new" entry included in this PR and (2) the "whatsnew-needed" label applied?
  • Is a milestone set? Milestone must be set but we cannot check for it on Actions; do not let the green checkmark fool you.
  • At the time of adding the milestone, if the milestone set requires a backport to release branch(es), apply the appropriate "backport-X.Y.x" label(s) before merge.

@pllim
Copy link
Member

pllim commented Mar 28, 2023

RTD failure is unrelated.

Copy link
Member

@pllim pllim left a comment

Choose a reason for hiding this comment

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

Better coverage is always 👍 from me. Thanks!

I'll approve but give @byrdie a chance to review.

Copy link
Contributor

@byrdie byrdie left a comment

Choose a reason for hiding this comment

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

Looks good to me, just a few ideas for minor improvements

astropy/units/tests/test_quantity_ufuncs.py Show resolved Hide resolved
def test_exception_with_where_quantity(self):
a = np.ones(2)
where = np.ones(2, bool) << u.m
with pytest.raises(TypeError):
Copy link
Contributor

Choose a reason for hiding this comment

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

should we use the match= keyword here?

Suggested change
with pytest.raises(TypeError):
with pytest.raises(TypeError, match=r"Cannot cast array data from .* to .* according to the rule .*"):

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, good idea, though I get a different error on numpy-dev (which I'll use...):

TypeError: operand type(s) all returned NotImplemented from __array_ufunc__(<ufunc 'add'>, '__call__', array([1., 1.]), array([1., 1.]), out=(array([1., 1.]),), where=<Quantity [ True,  True] m>): 'ndarray', 'ndarray', 'ndarray'

Copy link
Member

Choose a reason for hiding this comment

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

Do the different messages have anything in common that we can use some regex? If not, I guess we don't have to include "match".

Copy link
Contributor

Choose a reason for hiding this comment

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

I think I must've been using the wrong version of numpy since @mhvk's version is correct.

@mhvk
Copy link
Contributor Author

mhvk commented Mar 28, 2023

OK, adjusted. Will merge once tests pass. Thanks!

@mhvk mhvk merged commit b4194cd into astropy:main Mar 28, 2023
25 checks passed
@mhvk mhvk deleted the ufunc-where-override branch March 28, 2023 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants