Remove .flake8 config file so that config is defined in one place

ministryofjustice · Apr 22, 2024 · f488eab · f488eab
1 parent 4c265c7
commit f488eab
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -43,5 +43,5 @@ jobs:
           VALIDATE_PYTHON_RUFF: false
           LINTER_RULES_PATH: /
           PYTHON_BLACK_CONFIG_FILE: pyproject.toml
-          PYTHON_FLAKE8_CONFIG_FILE: .flake8
+          PYTHON_FLAKE8_CONFIG_FILE: setup.cfg
           PYTHON_ISORT_CONFIG_FILE: pyproject.toml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -28,4 +28,4 @@ repos:
     hooks:
     - id: flake8
       name: flake8 format check
-      entry: bash -c 'flake8 --config=.flake8 $(git diff --name-only --cached --diff-filter=ACMR | grep .py)'
+      entry: bash -c 'flake8 $(git diff --name-only --cached --diff-filter=ACMR | grep .py)'
diff --git a/setup.cfg b/setup.cfg
@@ -7,4 +7,15 @@ DJANGO_SETTINGS_MODULE = controlpanel.settings.test
 norecursedirs = .circleci .git .github .mypy_cache controlpanel doc docker node_modules run static venv
 
 [flake8]
-max-line-length = 88
+max-line-length = 100
+ignore =
+  E203,
+  E266,
+  W503,
+  F403,
+  F401
+max-complexity = 18
+select = B,C,E,F,W,T4,B9
+exclude =__init__.py,venv
+per-file-ignores =
+  controlpanel/api/migrations/*:E501,W292