Skip to content

Backport PR #12535: ENH: fix compatibility with numpy 1.23 - #12537

Merged
pllim merged 1 commit into
astropy:v5.0.xfrom
mhvk:auto-backport-of-pr-12535-on-v5.0.x
Nov 30, 2021
Merged

pllim merged 1 commit into
astropy:v5.0.xfrom
mhvk:auto-backport-of-pr-12535-on-v5.0.x

Conversation

@mhvk

@mhvk mhvk commented Nov 29, 2021

Copy link
Copy Markdown
Contributor

Manual backport, after solving small merge conflict. The instructions were super-useful!!!

@mhvk

mhvk commented Nov 29, 2021

Copy link
Copy Markdown
Contributor Author

Oops, a mandatory check fails complaining this is opened against 5.0.x!

@pllim

pllim commented Nov 29, 2021

Copy link
Copy Markdown
Member

Gonna do the close/open trick. I applied a special label just for you.

@pllim pllim closed this Nov 29, 2021
@pllim pllim reopened this Nov 29, 2021
@pllim

pllim commented Nov 29, 2021

Copy link
Copy Markdown
Member

No need to run the CI again... I'll just merge.

@pllim

pllim commented Nov 29, 2021

Copy link
Copy Markdown
Member

Oh wait, the original CI didn't run, did it. I'll just let it run and revisit tomorrow. 😅

@mhvk

mhvk commented Nov 30, 2021

Copy link
Copy Markdown
Contributor Author

Hmm, devdeps fails, but looking at it, it is some kind of spacing issue in docs, definitely unrelated to this PR.

@mhvk

mhvk commented Nov 30, 2021

Copy link
Copy Markdown
Contributor Author

p.s. For meeseeksdev, maybe add a note that one should add the skip-basebranch-check label? (You may already have done it...)

@pllim

pllim commented Nov 30, 2021

Copy link
Copy Markdown
Member

I did but it requires you to read the template carefully... I don't know where to draw the line between having the template be complete vs readable.

https://raw.githubusercontent.com/astropy/astropy/main/.github/PULL_REQUEST_TEMPLATE.md

<!-- READ THIS FOR MANUAL BACKPORT FROM A MAINTAINER:
Apply "skip-basebranch-check" label **before** you open the PR! -->

@pllim

pllim commented Nov 30, 2021

Copy link
Copy Markdown
Member

Yes, failures are unrelated. Merging. Thanks!

@pllim
pllim merged commit fff275d into astropy:v5.0.x Nov 30, 2021
@mhvk

mhvk commented Nov 30, 2021

Copy link
Copy Markdown
Contributor Author

Not quite sure where exactly to suggest, but I'd do the following in the message posted where the backport fails (i.e.,
#12535 (comment)) -- if that is under your control!

    Create a PR against branch v5.0.x, I would have named this PR:

    "Backport PR #12535 on branch v5.0.x (ENH: fix compatibility with numpy 1.23)"

And apply the correct labels and milestones.

Here I would change the last sentence to

And apply the correct labels and milestones, including the `skip-basebranch-check label.

@pllim

pllim commented Nov 30, 2021

Copy link
Copy Markdown
Member

@mhvk

mhvk commented Nov 30, 2021

Copy link
Copy Markdown
Contributor Author

Ah, that makes sense! Anyway, only a very small nitpick - I like the system quite a lot!

@mhvk
mhvk deleted the auto-backport-of-pr-12535-on-v5.0.x branch December 20, 2021 20:06
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.

2 participants