Skip to content

Updates from the package template - #955

Merged
Cadair merged 6 commits into
sunpy:mainfrom
SunPyBot:cruft/update
Aug 18, 2026
Merged

Updates from the package template#955
Cadair merged 6 commits into
sunpy:mainfrom
SunPyBot:cruft/update

Conversation

@SunPyBot

Copy link
Copy Markdown
Contributor

This is an autogenerated PR, which 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.

@Cadair
Cadair marked this pull request as ready for review August 12, 2026 10:40
@github-advanced-security

Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

@Cadair Cadair added No Changelog Entry Needed Skip all changelog checks. backport 2.4 on-merge: backport to 2.4 labels Aug 18, 2026
@Cadair Cadair added this to the 2.4.1 milestone Aug 18, 2026
@Cadair
Cadair merged commit 0129af4 into sunpy:main Aug 18, 2026
27 checks passed
@lumberbot-app

lumberbot-app Bot commented Aug 18, 2026

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

"Backport PR #955 on branch 2.4 (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 18, 2026
Cadair added a commit that referenced this pull request Aug 18, 2026
Co-authored-by: Cadair <1391051+Cadair@users.noreply.github.com>
Co-authored-by: Stuart Mumford <stuart@cadair.com>
Co-authored-by: SunPyBot <sunpybot@users.noreply.github.com>
(cherry picked from commit 0129af4)
@Cadair Cadair removed the Still Needs Manual Backport This PR needs manually backporting. label Aug 18, 2026
@SunPyBot
SunPyBot deleted the cruft/update branch August 19, 2026 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.4 on-merge: backport to 2.4 No Changelog Entry Needed Skip all changelog checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants