From e2fd15e5580537c87acb329f3c4c42c2b34905db Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 19:32:27 +0000
Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.3 → v0.4.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.3...v0.4.4)
---
 .pre-commit-config.yaml                    |  2 +-
 pyproject.toml                             | 10 ++++++----
 src/scmrepo/git/backend/pygit2/__init__.py |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 69728af..b17dc23 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -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]
diff --git a/pyproject.toml b/pyproject.toml
index 4d5b625..9f75ea5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -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
@@ -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"]
@@ -199,5 +201,5 @@ strict = true
 [tool.ruff.lint.isort]
 known-first-party = ["scmrepo"]
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pylint]
 max-args = 10
diff --git a/src/scmrepo/git/backend/pygit2/__init__.py b/src/scmrepo/git/backend/pygit2/__init__.py
index 9f99644..06ac2e7 100644
--- a/src/scmrepo/git/backend/pygit2/__init__.py
+++ b/src/scmrepo/git/backend/pygit2/__init__.py
@@ -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,