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

Add support for astropy 7 #772

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Add support for astropy 7 #772

merged 2 commits into from
Oct 23, 2024

Conversation

Cadair
Copy link
Member

@Cadair Cadair commented Oct 23, 2024

This is primarily fallout from astropy/astropy#16328

@Cadair Cadair added this to the 2.2.4 milestone Oct 23, 2024
@Cadair Cadair added [BugFix] backport 2.2 on-merge: backport to 2.2 labels Oct 23, 2024
@nabobalis nabobalis merged commit da6007e into sunpy:main Oct 23, 2024
19 checks passed
Copy link

lumberbot-app bot commented Oct 23, 2024

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
  1. 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.

@lumberbot-app lumberbot-app bot added the Still Needs Manual Backport This PR needs manually backporting. label Oct 23, 2024
@nabobalis nabobalis removed the Still Needs Manual Backport This PR needs manually backporting. label Oct 23, 2024
nabobalis added a commit that referenced this pull request Oct 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.2 on-merge: backport to 2.2 [BugFix]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants