From 1b810cfbf011936295f19adb6f3db4b98ae75272 Mon Sep 17 00:00:00 2001
From: Jirka Borovec <6035284+Borda@users.noreply.github.com>
Date: Thu, 2 May 2024 04:19:54 +0200
Subject: [PATCH] ci/lint: fix calling Ruff's format (#1457)

* ci/lint: fix calling Ruff's format

* Transition for ruff lint. Only checking the modified files.

---------

Co-authored-by: ifuryst <ifuryst@gmail.com>
---
 .github/workflows/lint.yml                | 6 +++++-
 Makefile                                  | 2 +-
 dev_config/python/.pre-commit-config.yaml | 6 +++---
 dev_config/python/ruff.toml               | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e16043e044..ba7ba862aa 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -33,6 +33,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up python
         uses: actions/setup-python@v5
         with:
@@ -42,7 +44,9 @@ jobs:
         run: pip install pre-commit==3.7.0
       - name: Run pre-commit hooks
         run: |
+          git fetch https://github.com/OpenDevin/OpenDevin.git main:main && \
           pre-commit run \
-            --all-files \
+            --files \
+            $(git diff --name-only $(git merge-base main $(git branch --show-current)) $(git branch --show-current) | tr '\n' ' ') \
             --show-diff-on-failure \
             --config ./dev_config/python/.pre-commit-config.yaml
diff --git a/Makefile b/Makefile
index 09e212030f..55fcd66a46 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ install-precommit-hooks:
 
 lint:
 	@echo "$(YELLOW)Running linters...$(RESET)"
-	@poetry run pre-commit run --all-files --show-diff-on-failure --config $(PRECOMMIT_CONFIG_PATH)
+	@poetry run pre-commit run --files $$(git diff --name-only $$(git merge-base main $$(git branch --show-current)) $$(git branch --show-current) | tr '\n' ' ') --show-diff-on-failure --config $(PRECOMMIT_CONFIG_PATH)
 
 build-frontend:
 	@echo "$(YELLOW)Building frontend...$(RESET)"
diff --git a/dev_config/python/.pre-commit-config.yaml b/dev_config/python/.pre-commit-config.yaml
index ef05b25b04..ff4597222f 100644
--- a/dev_config/python/.pre-commit-config.yaml
+++ b/dev_config/python/.pre-commit-config.yaml
@@ -20,16 +20,16 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.7
+    rev: v0.4.1
     hooks:
       # Run the linter.
       - id: ruff
-        entry: ruff check --config dev_config/python/ruff.toml opendevin/ agenthub/
+        entry: ruff check --config dev_config/python/ruff.toml
         types_or: [python, pyi, jupyter]
         args: [--fix]
       # Run the formatter.
       - id: ruff-format
-        entry: ruff check --config dev_config/python/ruff.toml opendevin/ agenthub/
+        entry: ruff format --config dev_config/python/ruff.toml
         types_or: [python, pyi, jupyter]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
diff --git a/dev_config/python/ruff.toml b/dev_config/python/ruff.toml
index 4efe096a30..170034c68c 100644
--- a/dev_config/python/ruff.toml
+++ b/dev_config/python/ruff.toml
@@ -15,7 +15,9 @@ ignore = [
     "E501",
 ]
 
-flake8-quotes = {inline-quotes = "single"}
+[lint.flake8-quotes]
+docstring-quotes = "double"
+inline-quotes = "single"
 
 [format]
 quote-style = "single"