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

Update precommit to prevent it breaking #6747

Merged
merged 1 commit into from
Jan 30, 2023
Merged

Update precommit to prevent it breaking #6747

merged 1 commit into from
Jan 30, 2023

Conversation

nabobalis
Copy link
Contributor

Isort needs updating.

@nabobalis nabobalis added No Changelog Entry Needed Infrastructure Issues or PRs that affect the CI or packaging of SunPy backport 4.0 labels Jan 30, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented Jan 30, 2023

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 4.1
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 578c47e66fff51c5b55da0bd2545335d4100d396
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #6747: Update precommit to prevent it breaking'
  1. Push to a named branch:
git push YOURFORK 4.1:auto-backport-of-pr-6747-on-4.1
  1. Create a PR against branch 4.1, I would have named this PR:

"Backport PR #6747 on branch 4.1 (Update precommit to prevent it breaking)"

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 Jan 30, 2023
nabobalis added a commit that referenced this pull request Jan 30, 2023
…ing) (#6748)

Co-authored-by: Nabil Freij <nabil.freij@gmail.com>
@nabobalis nabobalis removed the Still Needs Manual Backport This PR needs manually backporting label Jan 30, 2023
@nabobalis
Copy link
Contributor Author

Will port to 4.1 myself.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Infrastructure Issues or PRs that affect the CI or packaging of SunPy No Changelog Entry Needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants