Skip to content

Updates from the package template#836

Merged
nabobalis merged 2 commits into
mainfrom
cruft/update
May 5, 2025
Merged

Updates from the package template#836
nabobalis merged 2 commits into
mainfrom
cruft/update

Conversation

@github-actions

@github-actions github-actions Bot commented May 5, 2025

Copy link
Copy Markdown
Contributor

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 May 5, 2025
@nabobalis nabobalis added this to the 2.4.0 milestone May 5, 2025
@nabobalis nabobalis marked this pull request as ready for review May 5, 2025 15:40
@nabobalis nabobalis enabled auto-merge May 5, 2025 15:40
@nabobalis nabobalis merged commit 24bbb5a into main May 5, 2025
@nabobalis nabobalis deleted the cruft/update branch May 5, 2025 15:40
@lumberbot-app

lumberbot-app Bot commented May 5, 2025

Copy link
Copy Markdown

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 24bbb5aa454c6278e77a60df538e54a316be3da1
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #836: Updates from the package template'
  1. Push to a named branch:
git push YOURFORK 2.3:auto-backport-of-pr-836-on-2.3
  1. Create a PR against branch 2.3, I would have named this PR:

"Backport PR #836 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 May 5, 2025
nabobalis added a commit that referenced this pull request Jun 12, 2025
@nabobalis nabobalis removed the Still Needs Manual Backport This PR needs manually backporting. label Jun 12, 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants