From 60672976d68acb8fa06e2b87b87e3c922ec45583 Mon Sep 17 00:00:00 2001 From: Andrew Snare Date: Mon, 27 May 2024 17:48:10 +0200 Subject: [PATCH 1/4] Update ruff invocation to avoid warning. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0e2fbf2e01..a56358d1a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,7 +92,7 @@ fmt = ["black . --extend-exclude 'tests/unit/source_code/samples/*'", "mypy --disable-error-code 'annotation-unchecked' --exclude 'tests/unit/source_code/samples/*' .", "pylint --output-format=colorized -j 0 src tests"] verify = ["black --check . --extend-exclude 'tests/unit/source_code/samples/*'", - "ruff .", + "ruff check .", "mypy --exclude 'tests/unit/source_code/samples/*' .", "pylint --output-format=colorized -j 0 src tests"] lint = ["pylint --output-format=colorized -j 0 src tests"] From 02e4453dd180674d233f03c0f990dcca21e9e3d3 Mon Sep 17 00:00:00 2001 From: Andrew Snare Date: Mon, 27 May 2024 17:48:36 +0200 Subject: [PATCH 2/4] EditorConfig specification for the project. These settings match the project settings. --- .editorconfig | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..6eec9f04df --- /dev/null +++ b/.editorconfig @@ -0,0 +1,25 @@ +# Top-most EditorConfig file. +root = true + +# Universal settings. +[*] +indent_style = space +indent_size = 4 +tab_width = 8 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[Makefile] +indent_style = tab +indent_size = tab + +[*.{json,yml}] +indent_size = 2 + +[*.xml] +indent_size = 2 + +[*.scala] +indent_size = 2 From 1bca0d9057e134292667e8ec706117b984fa78f4 Mon Sep 17 00:00:00 2001 From: Andrew Snare Date: Mon, 27 May 2024 18:13:06 +0200 Subject: [PATCH 3/4] Mark phony Makefile targets as such. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index fc70580c27..73dd2dcfe8 100644 --- a/Makefile +++ b/Makefile @@ -25,3 +25,4 @@ integration: coverage: hatch run coverage && open htmlcov/index.html +.PHONY: all clean dev lint fmt test integration coverage From bb6260b0945ebe2a3ba6fa4fced02b84be7a44d2 Mon Sep 17 00:00:00 2001 From: Andrew Snare Date: Tue, 28 May 2024 09:10:55 +0200 Subject: [PATCH 4/4] Remove configuration for unused extensions. Co-authored-by: Serge Smertin <259697+nfx@users.noreply.github.com> --- .editorconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6eec9f04df..e7fac5fa46 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,9 +17,3 @@ indent_size = tab [*.{json,yml}] indent_size = 2 - -[*.xml] -indent_size = 2 - -[*.scala] -indent_size = 2