search

sunpy / ndcube

A base package for multi-dimensional contiguous and non-contiguous coordinate-aware arrays. "Maintainers": @danryanirish & @Cadair
http://docs.sunpy.org/projects/ndcube/
BSD 2-Clause "Simplified" License
44 stars 47 forks source link

Add tests for numpy dev and update for numpy 2 #729

Closed nabobalis closed 3 months ago

nabobalis commented 3 months ago

Needs backporting and probably a release.

nabobalis commented 3 months ago

I also imagine the tests will fail on oldest deps now.

How do we want to handle that?

lumberbot-app[bot] commented 3 months ago

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 2.2
git pull

  1. Cherry pick the first parent branch of the this PR on top of the older branch:

    git cherry-pick -x -m1 e7a0e2031980fb7084efaf6682c5dc23bff132c2

  2. You will likely have some merge/cherry-pick conflict here, fix them and commit:

git commit -am 'Backport PR #729: Add tests for numpy dev and update for numpy 2'
  1. Push to a named branch:
git push YOURFORK 2.2:auto-backport-of-pr-729-on-2.2
  1. Create a PR against branch 2.2, I would have named this PR:

"Backport PR #729 on branch 2.2 (Add tests for numpy dev and update for numpy 2)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.