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 #2799

Merged
merged 2 commits into from
Jan 9, 2024

Conversation

pre-commit-ci[bot]
Copy link
Contributor

@pre-commit-ci pre-commit-ci bot commented Jan 8, 2024

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.1.11](astral-sh/ruff-pre-commit@v0.1.9...v0.1.11)
Copy link

codecov bot commented Jan 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9b08d35) 72.84% compared to head (554567f) 72.84%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2799   +/-   ##
=======================================
  Coverage   72.84%   72.84%           
=======================================
  Files         111      111           
  Lines       12367    12367           
=======================================
  Hits         9009     9009           
  Misses       3358     3358           

@flying-sheep flying-sheep added this to the 1.9.7 milestone Jan 9, 2024
@flying-sheep flying-sheep merged commit c410cd1 into master Jan 9, 2024
13 of 15 checks passed
@flying-sheep flying-sheep deleted the pre-commit-ci-update-config branch January 9, 2024 12:12
Copy link

lumberbot-app bot commented Jan 9, 2024

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 c410cd123f5487f25c08b421c8d06da50551ff73
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2799: [pre-commit.ci] pre-commit autoupdate'
  1. Push to a named branch:
git push YOURFORK 1.9.x:auto-backport-of-pr-2799-on-1.9.x
  1. Create a PR against branch 1.9.x, I would have named this PR:

"Backport PR #2799 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