From b636ad5183db5358d374e57ce78a9fc2b317f629 Mon Sep 17 00:00:00 2001 From: kingbuzzman Date: Wed, 23 Jul 2025 09:25:33 -0400 Subject: [PATCH 1/3] Removes the .flake8 and moves it all to pyproject --- .flake8 | 18 ------------------ pyproject.toml | 11 +++++++++++ 2 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 .flake8 diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 3d94dbae..00000000 --- a/.flake8 +++ /dev/null @@ -1,18 +0,0 @@ -[flake8] -max-line-length=100 -select= - # flake8-mccabe - C901, - # flake8-pycodestyle - E, - # flake8-pyflakes - F, - # flake8-pycodestyle - W, -ignore = - # conflict with black formatter - W503,E203, -per-file-ignores = - # supression for __init__ - diff_cover/tests/*: E501 - diff_cover/tests/fixtures/*: E,F,W \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index a920aafd..31cd4e23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -137,6 +137,17 @@ exclude = [ ignore = [ "E501", # line too long "W503", # line break before binary operator + "E203", # whitespace before ':', conflicts with black +] +select = [ + "C901", # flake8-mccabe + "E", # flake8-pycodestyle + "F", # flake8-pyflakes + "W", # flake8-pycodestyle +] +per-file-ignores = [ + "diff_cover/tests/*: E501", # suppression for __init__ + "diff_cover/tests/fixtures/*: E,F,W" ] [tool.coverage.run] From e32cecbacdcc962f66384d21ce7ba6857dcaa75c Mon Sep 17 00:00:00 2001 From: kingbuzzman Date: Wed, 23 Jul 2025 11:31:52 -0400 Subject: [PATCH 2/3] Unifies the line length accross tools --- .flake8 | 18 ++++++++++++++++++ pyproject.toml | 13 +------------ 2 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 .flake8 diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000..3d94dbae --- /dev/null +++ b/.flake8 @@ -0,0 +1,18 @@ +[flake8] +max-line-length=100 +select= + # flake8-mccabe + C901, + # flake8-pycodestyle + E, + # flake8-pyflakes + F, + # flake8-pycodestyle + W, +ignore = + # conflict with black formatter + W503,E203, +per-file-ignores = + # supression for __init__ + diff_cover/tests/*: E501 + diff_cover/tests/fixtures/*: E,F,W \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 31cd4e23..3f62a949 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,7 @@ requires = ["poetry-core>=1.0.7"] build-backend = "poetry.core.masonry.api" [tool.black] -line-length = 88 +line-length = 100 target-version = ['py39'] include = '\.pyi?$' exclude = "tests/fixtures/*|\\.venv/*" @@ -137,17 +137,6 @@ exclude = [ ignore = [ "E501", # line too long "W503", # line break before binary operator - "E203", # whitespace before ':', conflicts with black -] -select = [ - "C901", # flake8-mccabe - "E", # flake8-pycodestyle - "F", # flake8-pyflakes - "W", # flake8-pycodestyle -] -per-file-ignores = [ - "diff_cover/tests/*: E501", # suppression for __init__ - "diff_cover/tests/fixtures/*: E,F,W" ] [tool.coverage.run] From c4ba814082d039d22f5ae2862f6d6586c8c06c37 Mon Sep 17 00:00:00 2001 From: kingbuzzman Date: Wed, 23 Jul 2025 11:35:23 -0400 Subject: [PATCH 3/3] Missed one --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 07e8ee7b..cf5369ba 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,7 +11,7 @@ end_of_line = lf charset = utf-8 [*.py] -max_line_length = 88 +max_line_length = 100 [*.html] indent_size = 2