Skip to content

Updates from the package template #875

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

Merged
merged 2 commits into from
Jul 14, 2025
Merged

Updates from the package template #875

merged 2 commits into from
Jul 14, 2025

Conversation

github-actions[bot]
Copy link

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 Jul 14, 2025
@Cadair Cadair added this to the 2.3.2 milestone Jul 14, 2025
@Cadair Cadair requested a review from DanRyanIrish July 14, 2025 15:15
@nabobalis nabobalis merged commit 640812d into main Jul 14, 2025
17 of 18 checks passed
@nabobalis nabobalis deleted the cruft/update branch July 14, 2025 16:47
Copy link

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

"Backport PR #875 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 Jul 14, 2025
@nabobalis nabobalis removed the request for review from DanRyanIrish July 14, 2025 16:47
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.

2 participants