From 59a29b219e538b6f76a9791892b92b86d26c6439 Mon Sep 17 00:00:00 2001
From: Adrian Herrmann <adrian.herrmann@qt.io>
Date: Thu, 25 Jan 2024 00:53:05 +0100
Subject: Make VS Code use .flake8 file

VS Code now uses the .flake8 file (formerly setup.cfg) for its flake8
configuration, instead of setting arguments in settings.json.

Change-Id: I7f85a3ab14e2d2445c62185e593f5bec5d19a768
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit bd0f6c187c560a59884dd1c7640f9352ec457a6c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .flake8               | 4 ++++
 .vscode/settings.json | 8 +-------
 setup.cfg             | 4 ----
 3 files changed, 5 insertions(+), 11 deletions(-)
 create mode 100644 .flake8
 delete mode 100644 setup.cfg

diff --git a/.flake8 b/.flake8
new file mode 100644
index 000000000..8a5c9d69a
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,4 @@
+[flake8]
+ignore = E115,E265,W503
+max-line-length = 100
+exclude = rc_*.py,*_rc.py,ui_*.py
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 969dd1de0..3d19a40b4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,12 +14,6 @@
     "python.testing.pytestEnabled": false,
     "python.testing.unittestEnabled": true,
     "flake8.args": [
-        "--ignore=E115,E265,W503",
-        "--max-line-length=100"
-    ],
-    "flake8.ignorePatterns": [
-        "rc_*.py",
-        "*_rc.py",
-        "ui_*.py",
+        "--config=.flake8"
     ]
 }
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 8a5c9d69a..000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[flake8]
-ignore = E115,E265,W503
-max-line-length = 100
-exclude = rc_*.py,*_rc.py,ui_*.py
-- 
cgit v1.2.3