Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:
- id: sort-simple-yaml
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.4.3'
rev: 'v0.4.4'
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
10 changes: 6 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ ignore_missing_imports = true
ignore-words-list = "cachable, keypair"

[tool.ruff]
output-format = "full"
show-fixes = true

[tool.ruff.lint]
ignore = [
"S101", # assert
"PLR2004", # magic-value-comparison
Expand Down Expand Up @@ -180,10 +184,8 @@ select = [
"W", # pycodestyle - Warning
"YTT", # flake8-2020
]
show-source = true
show-fixes = true

[tool.ruff.per-file-ignores]
[tool.ruff.lint.per-file-ignores]
"noxfile.py" = ["D", "PTH"]
"tests/**" = ["S", "ARG001", "ARG002", "ANN"]
"docs/**" = ["INP"]
Expand All @@ -199,5 +201,5 @@ strict = true
[tool.ruff.lint.isort]
known-first-party = ["scmrepo"]

[tool.ruff.pylint]
[tool.ruff.lint.pylint]
max-args = 10
2 changes: 1 addition & 1 deletion src/scmrepo/git/backend/pygit2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ def status(
def iter_remote_refs(self, url: str, base: Optional[str] = None, **kwargs):
raise NotImplementedError

def merge( # noqa: C901
def merge( # noqa: C901, PLR0912
self,
rev: str,
commit: bool = True,
Expand Down