From 721cca12e3e2f90a439fb15043f7979da77157cf Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 1 Apr 2025 18:52:01 +0200 Subject: [PATCH 1/2] Drop flake8 in favor of ruff --- .flake8 | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/.flake8 b/.flake8 index 44d344c1..189aab03 100644 --- a/.flake8 +++ b/.flake8 @@ -1,41 +1,12 @@ [flake8] ignore = - # indentation is not a multiple of four, - E111,E114, - # visually indented line with same indent as next logical line, - E129, - # expected 2 blank lines, found 1 - E302,E305, - # closing bracket does not match indentation of opening bracket's line - E123, # whitespace before ':' E203, - # multiple spaces before operator - E221, + # Type hint with abstract type `collections.abc.Iterable` or `collections.abc.Sequence`, instead of concrete type `list` + KTH101, # line break before binary operator W503, # line break after binary operator - W504, - # multiple statements on one line - E701, - # continuation line under-indented for hanging indent - E121, - # closing bracket does not match visual indentation - E124, - # continuation line with same indent as next logical line - E125, - # continuation line over-indented for visual indent - E127, - # continuation line under-indented for visual indent - E128, - # unexpected indentation - E116, - # continuation line unaligned for hanging indent - E131, - # too many blank lines - E303, - # missing whitespace around arithmetic operator - E226, - # test for membership should be 'not in' - E713, + W504 max-line-length=100 +max-complexity=30 From 77030fa72ae52ef01ca0b73ce267d41f07f18cf6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 1 Apr 2025 18:54:12 +0200 Subject: [PATCH 2/2] Drop flake8 in favor of ruff --- .flake8 | 12 ------------ .pre-commit-config.yaml | 9 ++------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 .flake8 diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 189aab03..00000000 --- a/.flake8 +++ /dev/null @@ -1,12 +0,0 @@ -[flake8] -ignore = - # whitespace before ':' - E203, - # Type hint with abstract type `collections.abc.Iterable` or `collections.abc.Sequence`, instead of concrete type `list` - KTH101, - # line break before binary operator - W503, - # line break after binary operator - W504 -max-line-length=100 -max-complexity=30 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d018e587..ac664642 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,22 +15,17 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.0 + rev: v0.11.2 hooks: - id: ruff - id: ruff-format - - repo: https://github.com/pycqa/flake8 - rev: 7.1.2 - hooks: - - id: flake8 - - repo: https://github.com/tox-dev/pyproject-fmt rev: v2.5.1 hooks: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.24 + rev: v0.24.1 hooks: - id: validate-pyproject