Add ruff format check to lints (#2517)

* Add ruff format --check to lints * Unrelated format
nuclia · Oct 7, 2024 · 67c726a · 67c726a
1 parent bcc9fc7
commit 67c726a
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 6 deletions.
diff --git a/nucliadb/Makefile b/nucliadb/Makefile
@@ -28,6 +28,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini .
 
 # pytest doesn't support test discovery across our multiple "top-level folders"

diff --git a/nucliadb/tests/search/unit/test_find_merge.py b/nucliadb/tests/search/unit/test_find_merge.py
@@ -83,14 +83,10 @@ def test_merge_paragraphs_vectors():
 
     # Check that the paragraphs are ordered by score
     bm25_scores = [
-        text_block.score
-        for text_block in paragraphs
-        if text_block.score_type == SCORE_TYPE.BM25
+        text_block.score for text_block in paragraphs if text_block.score_type == SCORE_TYPE.BM25
     ]
     vector_scores = [
-        text_block.score
-        for text_block in paragraphs
-        if text_block.score_type == SCORE_TYPE.VECTOR
+        text_block.score for text_block in paragraphs if text_block.score_type == SCORE_TYPE.VECTOR
     ]
     assert bm25_scores == sorted(bm25_scores, reverse=True)
     assert vector_scores == sorted(vector_scores, reverse=True)

diff --git a/nucliadb_dataset/Makefile b/nucliadb_dataset/Makefile
@@ -6,6 +6,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini .
 
 .PHONY: test

diff --git a/nucliadb_models/Makefile b/nucliadb_models/Makefile
@@ -6,6 +6,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini .
 
 .PHONY: test

diff --git a/nucliadb_node/Makefile b/nucliadb_node/Makefile
@@ -11,6 +11,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini .
 
 .PHONY: test

diff --git a/nucliadb_node_binding/Makefile b/nucliadb_node_binding/Makefile
@@ -13,6 +13,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml tests
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini .
 
 .PHONY: test

diff --git a/nucliadb_performance/Makefile b/nucliadb_performance/Makefile
@@ -51,6 +51,7 @@ format: # Format the code
 .PHONY: lint
 lint: # Run lint checks
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini . --show-traceback
 
 

diff --git a/nucliadb_sdk/Makefile b/nucliadb_sdk/Makefile
@@ -6,6 +6,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini .
 
 .PHONY: test

diff --git a/nucliadb_sidecar/Makefile b/nucliadb_sidecar/Makefile
@@ -11,6 +11,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini .
 
 .PHONY: test

diff --git a/nucliadb_telemetry/Makefile b/nucliadb_telemetry/Makefile
@@ -11,6 +11,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini . --show-traceback
 
 .PHONY: test

diff --git a/nucliadb_utils/Makefile b/nucliadb_utils/Makefile
@@ -7,6 +7,7 @@ format:
 .PHONY: lint
 lint:
 	ruff check --config=../ruff.toml .
+	ruff format --check --config=../ruff.toml .
 	MYPYPATH=../mypy_stubs mypy --config-file=../mypy.ini src
 
 .PHONY: test