From 67c726a342ceb2f6cee36133ba93a46064e03d6b Mon Sep 17 00:00:00 2001 From: Joan Antoni RE Date: Mon, 7 Oct 2024 09:18:07 +0200 Subject: [PATCH] Add ruff format check to lints (#2517) * Add ruff format --check to lints * Unrelated format --- nucliadb/Makefile | 1 + nucliadb/tests/search/unit/test_find_merge.py | 8 ++------ nucliadb_dataset/Makefile | 1 + nucliadb_models/Makefile | 1 + nucliadb_node/Makefile | 1 + nucliadb_node_binding/Makefile | 1 + nucliadb_performance/Makefile | 1 + nucliadb_sdk/Makefile | 1 + nucliadb_sidecar/Makefile | 1 + nucliadb_telemetry/Makefile | 1 + nucliadb_utils/Makefile | 1 + 11 files changed, 12 insertions(+), 6 deletions(-) diff --git a/nucliadb/Makefile b/nucliadb/Makefile index 7651530077..a32ca1c67b 100644 --- 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 index 924d450b4e..a323027acc 100644 --- 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 index 446f48ecbb..f260abc0c7 100644 --- 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 index b20f5c9787..77be1ca58d 100644 --- 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 index dcd4468a23..fb9ccfd80b 100644 --- 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 index 03c8dfe0b6..0800f9682b 100644 --- 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 index 85574b765f..24aa44f354 100644 --- 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 index aba4ec1255..b9590bbc55 100644 --- 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 index 7d6c1dbbc9..21f7cb2267 100644 --- 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 index e89579e8b5..a76a899420 100644 --- 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 index 20b2377cd0..33fcaa659c 100644 --- 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