Skip to content

Updates from the package template#877

Merged
Cadair merged 1 commit intomainfrom
cruft/update
Aug 4, 2025
Merged

Updates from the package template#877
Cadair merged 1 commit intomainfrom
cruft/update

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Aug 4, 2025

This is an autogenerated PR, which will applies the latest changes from the SunPy Package Template.
If this pull request has been opened as a draft there are conflicts which need fixing.

To run the CI on this pull request you will need to close it and reopen it.

@github-actions github-actions bot added backport 2.3 on-merge: backport to 2.3 No Changelog Entry Needed Skip all changelog checks. labels Aug 4, 2025
@Cadair Cadair added this to the 2.3.2 milestone Aug 4, 2025
@Cadair Cadair closed this Aug 4, 2025
@Cadair Cadair reopened this Aug 4, 2025
@Cadair Cadair merged commit 5459a4e into main Aug 4, 2025
7 of 9 checks passed
@Cadair Cadair deleted the cruft/update branch August 4, 2025 08:14
@lumberbot-app
Copy link

lumberbot-app bot commented Aug 4, 2025

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.3
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 5459a4e5165dde11eb5542a0fdaa592024b128fa
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #877: Updates from the package template'
  1. Push to a named branch:
git push YOURFORK 2.3:auto-backport-of-pr-877-on-2.3
  1. Create a PR against branch 2.3, I would have named this PR:

"Backport PR #877 on branch 2.3 (Updates from the package template)"

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 Aug 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.3 on-merge: backport to 2.3 No Changelog Entry Needed Skip all changelog checks. Still Needs Manual Backport This PR needs manually backporting.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant