search

sunpy / ndcube

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

Add support for astropy 7 #772

Closed Cadair closed 3 weeks ago

Cadair commented 3 weeks ago

This is primarily fallout from https://github.com/astropy/astropy/pull/16328

lumberbot-app[bot] commented 3 weeks 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 da6007eac59228e2b2fc754eb1a4e896e86ac04d

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

git commit -am 'Backport PR #772: Add support for astropy 7'
  1. Push to a named branch:
git push YOURFORK 2.2:auto-backport-of-pr-772-on-2.2
  1. Create a PR against branch 2.2, I would have named this PR:

"Backport PR #772 on branch 2.2 (Add support for astropy 7)"

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.