Migrate flake8 and black to ruff

Author: berendkleinhaneveld

.github/workflows/ci.yml

@@ -43,7 +43,9 @@ jobs:
       - name: Install dependencies
         run: uv sync
       - name: Lint
-        run: uv run flake8
+        run: uv run ruff check
+      - name: Format
+        run: uv run ruff format --check
       - name: Test
         run: uv run pytest -v --cov=patchdiff --cov-report=term-missing
 
@@ -63,7 +65,7 @@ jobs:
     - name: Build wheel
       run: uv build
     - name: Twine check
-      run: uv run twine check dist/*
+      run: uvx twine check dist/*
     - name: Upload wheel artifact
       uses: actions/upload-artifact@v4
       with:

patchdiff/diff.py

@@ -71,13 +71,13 @@ def pad(state, op, target=None):
                 "path": ptr.append(idx_token),
                 "value": op["value"],
             }
-            return [ops + [full_op], padding + 1]
+            return [[*ops, full_op], padding + 1]
         elif op["op"] == "remove":
             full_op = {
                 "op": "remove",
                 "path": ptr.append(op["idx"] + padding),
             }
-            return [ops + [full_op], padding - 1]
+            return [[*ops, full_op], padding - 1]
         else:
             replace_ptr = ptr.append(op["idx"] + padding)
             replace_ops, _ = diff(op["original"], op["value"], replace_ptr)

patchdiff/pointer.py

@@ -3,7 +3,6 @@
 
 from .types import Diffable
 
-
 tilde0_re = re.compile("~0")
 tilde1_re = re.compile("~1")
 tilde_re = re.compile("~")
@@ -19,7 +18,7 @@ def escape(token: str) -> str:
 
 
 class Pointer:
-    def __init__(self, tokens: List[Hashable] = None) -> None:
+    def __init__(self, tokens: List[Hashable] | None = None) -> None:
         if tokens is None:
             tokens = []
         self.tokens = tuple(tokens)
@@ -33,7 +32,7 @@ def __str__(self) -> str:
         return "/" + "/".join(escape(str(t)) for t in self.tokens)
 
     def __repr__(self) -> str:
-        return f"Pointer({repr(list(self.tokens))})"
+        return f"Pointer({list(self.tokens)!r})"
 
     def __hash__(self) -> int:
         return hash(self.tokens)
@@ -62,4 +61,4 @@ def evaluate(self, obj: Diffable) -> Tuple[Diffable, Hashable, Any]:
 
     def append(self, token: Hashable) -> "Pointer":
         """append, creating new Pointer"""
-        return Pointer(self.tokens + (token,))
+        return Pointer((*self.tokens, token))

pyproject.toml

@@ -14,17 +14,25 @@ Homepage = "https://github.com/fork-tongue/patchdiff"
 
 [dependency-groups]
 dev = [
-    "flake8",
-    "black",
-    "flake8-black",
-    "flake8-import-order",
-    "flake8-print",
+    "ruff",
     "pytest",
     "pytest-cov",
     "pytest-watch",
-    "twine",
 ]
 
+[tool.ruff.lint]
+extend-select = [
+    "F",    # Pyflakes (default)
+    "I",    # isort imports
+    "N",    # pep8-naming
+    "T10",  # flake8-debugger
+    "T20",  # flake8-print
+    "RUF",  # ruff
+]
+
+[tool.ruff.lint.per-file-ignores]
+"patchdiff/__init__.py" = ["F401"]
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

setup.cfg

@@ -2,6 +2,7 @@
 Tests that check that patchdiff apply and diff work
 on proxied objects.
 """
+
 from collections import UserDict, UserList
 from collections.abc import Set