Skip to content

Commit

Permalink
Merge branch 'main' into unbound-os-import-adodbapi
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam authored Dec 24, 2024
2 parents f443a4a + 71c6017 commit 957d947
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,10 @@ jobs:
cache-dependency-path: .github/workflows/main.yml
- run: pip install clang-format==18.1.* pycln
- run: pycln . --config=pycln.toml --check
- uses: astral-sh/ruff-action@v1
- uses: astral-sh/ruff-action@v2
with:
version: "0.4.9"
- uses: astral-sh/ruff-action@v1
with:
version: "0.4.9"
args: "format --check"
version: "0.8.2"
- run: ruff format --check
- run:
| # Too many files to fit in a single command, also exclude vendored Scintilla and MAPIStubLibrary
clang-format --Werror --dry-run $(git ls-files '*.cpp' ':!:com/win32comext/mapi/src/MAPIStubLibrary/')
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repos:
args: [--config=pycln.toml]
verbose: true
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.5
rev: v0.8.2
hooks:
- id: ruff # Run the linter.
args: [--fix]
Expand Down
7 changes: 4 additions & 3 deletions ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ select = [
"UP037", # quoted-annotation

# Helps prevent circular imports and other unneeded imports
"TCH", # flake8-type-checking
"TC", # flake8-type-checking
]
extend-ignore = [
ignore = [
"PLE0704", # misplaced-bare-raise: TODO
# No such concerns for stdlib
"TCH003", # typing-only-standard-library-import
"TC003", # typing-only-standard-library-import
]

[lint.per-file-ignores]
Expand Down

0 comments on commit 957d947

Please sign in to comment.