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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 7 commits into from
Oct 28, 2024
Merged

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

merged 7 commits into from
Oct 28, 2024

Conversation

pre-commit-ci[bot]
Copy link
Contributor

@pre-commit-ci pre-commit-ci bot commented Oct 8, 2024 •
edited
Loading

@sf1919
Copy link
Contributor

sf1919 commented Oct 8, 2024

Please don't review until after #38126 goes in.

@sf1919 sf1919 added this to the Release 6.12 milestone Oct 9, 2024
@pre-commit-ci pre-commit-ci bot force-pushed the pre-commit-ci-update-config branch from a492e93 to af85104 Compare October 21, 2024 22:33
@peterfpeterson peterfpeterson force-pushed the pre-commit-ci-update-config branch 3 times, most recently from e32e367 to fb78386 Compare October 22, 2024 17:49
@github-actions github-actions bot added the Has Conflicts Used by the bot to label pull requests that have conflicts label Oct 22, 2024
@github-actions GitHub Actions
Copy link

👋 Hi, @pre-commit-ci,

Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

@peterfpeterson peterfpeterson force-pushed the pre-commit-ci-update-config branch from fb78386 to 8f1f9c0 Compare October 23, 2024 12:22
@github-actions github-actions bot added Has Conflicts Used by the bot to label pull requests that have conflicts and removed Has Conflicts Used by the bot to label pull requests that have conflicts labels Oct 23, 2024
@github-actions GitHub Actions
Copy link

👋 Hi, @pre-commit-ci,

Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

@peterfpeterson peterfpeterson force-pushed the pre-commit-ci-update-config branch from 8f1f9c0 to 2f81608 Compare October 24, 2024 17:19
@github-actions github-actions bot removed the Has Conflicts Used by the bot to label pull requests that have conflicts label Oct 24, 2024
@robertapplin robertapplin self-assigned this Oct 25, 2024
@thomashampson thomashampson self-assigned this Oct 25, 2024
robertapplin
robertapplin suggested changes Oct 25, 2024
View reviewed changes
Copy link
Contributor

@robertapplin robertapplin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The majority of the formatting changes look good. There are a couple of oddities in some of the formatted files, see below

@peterfpeterson peterfpeterson force-pushed the pre-commit-ci-update-config branch from e005e02 to 522921a Compare October 25, 2024 14:59
@peterfpeterson
Copy link
Member

I've rebased on main. Let's see how things progress.

robertapplin
robertapplin previously approved these changes Oct 28, 2024
View reviewed changes
thomashampson
thomashampson requested changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@thomashampson thomashampson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few minor things to fix (see individual comments):

  • some namespace comments have been added in the wrong place
  • a lot of commented out includes should be removed
  • some comment formatting can be adjusted

pre-commit-ci bot and others added 7 commits October 28, 2024 09:28
@pre-commit-ci @peterfpeterson
[pre-commit.ci] pre-commit autoupdate
8a6cd4d 
updates:
- [github.com/pre-commit/pre-commit-hooks.git: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks.git/compare/v4.6.0...v5.0.0)
- [github.com/pre-commit/mirrors-clang-format: v12.0.1 → v19.1.2](pre-commit/mirrors-clang-format@v12.0.1...v19.1.2)
- [github.com/astral-sh/ruff-pre-commit: v0.6.8 → v0.7.0](astral-sh/ruff-pre-commit@v0.6.8...v0.7.0)
@pre-commit-ci @peterfpeterson
[pre-commit.ci] auto fixes from pre-commit.com hooks
9485437 
for more information, see https://pre-commit.ci
@peterfpeterson
Fixing cppcheck warnings
60b925b
@pre-commit-ci @peterfpeterson
[pre-commit.ci] auto fixes from pre-commit.com hooks
f4589cf 
for more information, see https://pre-commit.ci
@peterfpeterson
Do not reformat thing in qt/icons/resources
56b8109
@peterfpeterson
Override what clang-format thinks is right
10f41e8 
For clang-format v19.1.2 it seems to have a hard time with some
`struct` declarations. This turns off formatting around those
areas. Maybe in a future version it can be turned back on again.
@peterfpeterson
Cleaning up formatting
dad070b
@peterfpeterson peterfpeterson force-pushed the pre-commit-ci-update-config branch from 7a69227 to dad070b Compare October 28, 2024 13:29
thomashampson
thomashampson approved these changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@thomashampson thomashampson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the changes. Looking good.

@thomashampson thomashampson merged commit b0269c0 into main Oct 28, 2024
10 checks passed
@thomashampson thomashampson deleted the pre-commit-ci-update-config branch October 28, 2024 17:04
@peterfpeterson peterfpeterson mentioned this pull request Oct 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterfpeterson peterfpeterson peterfpeterson left review comments

@thomashampson thomashampson thomashampson approved these changes

@robertapplin robertapplin robertapplin left review comments

Assignees

@thomashampson thomashampson

@robertapplin robertapplin

Labels
None yet
Projects
None yet
Milestone
Release 6.12
Development

Successfully merging this pull request may close these issues.
4 participants
@sf1919 @peterfpeterson @thomashampson @robertapplin