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

Ensure that np.concatenate with dtype argument works on quantities and masked data #13323

Merged
merged 1 commit into from
Jun 11, 2022

Conversation

mhvk
Copy link
Contributor

@mhvk mhvk commented Jun 11, 2022

Description

This pull request ensures np.concatenate will work on Quantity and Masked also with the dtype argument (new since numpy 1.20); see discussion in #13322 (but relevant not just for numpy-dev).

Fixes #

Checklist for package maintainer(s)

This checklist is meant to remind the package maintainer(s) who will review this pull request of some common things to look for. This list is not exhaustive.

  • 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.
  • 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 astropy-bot check might be missing; 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.

@mhvk mhvk added units Bug utils.masked 💤 backport-v5.0.x on-merge: backport to v5.0.x 💤 backport-v5.1.x on-merge: backport to v5.1.x labels Jun 11, 2022
@mhvk mhvk added this to the v5.2 milestone Jun 11, 2022
@github-actions github-actions bot added the utils label Jun 11, 2022
@mhvk mhvk mentioned this pull request Jun 11, 2022
10 tasks
@mhvk
Copy link
Contributor Author

mhvk commented Jun 11, 2022

Both failures are unrelated - see #13322

@pllim pllim modified the milestones: v5.2, v5.0.5 Jun 11, 2022
@pllim
Copy link
Member

pllim commented Jun 11, 2022

It hard to prove this really fixed the problem because the dev job didn't run at all. I'll see if I can make the matplotlib stuff go away.

@mhvk
Copy link
Contributor Author

mhvk commented Jun 11, 2022

Actually, it is not that bad: this does test with numpy 1.20, and that had a bug already. So, that is fixed by this PR. If we then rebase yours, we can check that it also solved the numpy-dev issues.

@pllim
Copy link
Member

pllim commented Jun 11, 2022

@mhvk , please rebase. Thanks!

@mhvk mhvk force-pushed the quantity-masked-concatenate-dtype-argument branch from bb368dc to 4036526 Compare June 11, 2022 12:32
@mhvk
Copy link
Contributor Author

mhvk commented Jun 11, 2022

OK, rebased. Hopefully all the tests pass now!

@mhvk
Copy link
Contributor Author

mhvk commented Jun 11, 2022

OK, all tests passed now!

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.

Thanks!

@pllim pllim merged commit bf50ff3 into astropy:main Jun 11, 2022
meeseeksmachine pushed a commit to meeseeksmachine/astropy that referenced this pull request Jun 11, 2022
meeseeksmachine pushed a commit to meeseeksmachine/astropy that referenced this pull request Jun 11, 2022
@mhvk mhvk deleted the quantity-masked-concatenate-dtype-argument branch June 11, 2022 18:07
@mhvk
Copy link
Contributor Author

mhvk commented Jun 11, 2022

Thanks for keeping a look-out for those -dev failures! And good that a somewhat larger buglet got solved in the process!

mhvk added a commit that referenced this pull request Jun 11, 2022
…323-on-v5.1.x

Backport PR #13323 on branch v5.1.x (Ensure that np.concatenate with dtype argument works on quantities and masked data)
mhvk added a commit that referenced this pull request Jun 11, 2022
…323-on-v5.0.x

Backport PR #13323 on branch v5.0.x (Ensure that np.concatenate with dtype argument works on quantities and masked data)
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

2 participants