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

[pre-commit.ci] pre-commit autoupdate #2704

Merged
merged 1 commit into from
Oct 24, 2023

Conversation

pre-commit-ci[bot]
Copy link
Contributor

@pre-commit-ci pre-commit-ci bot commented Oct 23, 2023

updates:
- [github.com/psf/black: 23.9.1 → 23.10.0](psf/black@23.9.1...23.10.0)
- [github.com/astral-sh/ruff-pre-commit: v0.0.292 → v0.1.1](astral-sh/ruff-pre-commit@v0.0.292...v0.1.1)
@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Merging #2704 (8508031) into master (373c585) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2704   +/-   ##
=======================================
  Coverage   72.01%   72.01%           
=======================================
  Files         108      108           
  Lines       11934    11934           
=======================================
  Hits         8594     8594           
  Misses       3340     3340           

@flying-sheep flying-sheep added this to the 1.9.6 milestone Oct 24, 2023
@flying-sheep flying-sheep merged commit 95206dc into master Oct 24, 2023
13 of 15 checks passed
@flying-sheep flying-sheep deleted the pre-commit-ci-update-config branch October 24, 2023 07:33
@lumberbot-app
Copy link

lumberbot-app bot commented Oct 24, 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 1.9.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 95206dc54c8bb0d9d478f09f47dff9477a5c58c4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2704: [pre-commit.ci] pre-commit autoupdate'
  1. Push to a named branch:
git push YOURFORK 1.9.x:auto-backport-of-pr-2704-on-1.9.x
  1. Create a PR against branch 1.9.x, I would have named this PR:

"Backport PR #2704 on branch 1.9.x ([pre-commit.ci] pre-commit autoupdate)"

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant