From ddaf44a91bad3a70a55bddca5252240d1a33fe9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 2 Sep 2024 14:03:47 +0200
Subject: [PATCH] move all ruff settings in one place

---
 checks/lib/container-driver/pyproject.toml | 21 ---------------------
 pkgs/clan-app/pyproject.toml               | 19 -------------------
 pkgs/clan-cli/pyproject.toml               | 22 ----------------------
 pkgs/clan-vm-manager/pyproject.toml        | 20 --------------------
 pyproject.toml                             | 10 +++++++---
 5 files changed, 7 insertions(+), 85 deletions(-)

diff --git a/checks/lib/container-driver/pyproject.toml b/checks/lib/container-driver/pyproject.toml
index 3ac4bb008..136c15a1d 100644
--- a/checks/lib/container-driver/pyproject.toml
+++ b/checks/lib/container-driver/pyproject.toml
@@ -14,27 +14,6 @@ find = {}
 
 [tool.setuptools.package-data]
 test_driver = ["py.typed"]
-
-[tool.ruff]
-target-version = "py311"
-line-length = 88
-
-lint.select = [
-  "A",
-  "ANN",
-  "B",
-  "C4",
-  "E",
-  "F",
-  "I",
-  "N",
-  "RUF",
-  "TID",
-  "T100",
-  "U",
-]
-lint.ignore = ["E501", "ANN101", "ANN401", "A003"]
-
 [tool.mypy]
 python_version = "3.11"
 warn_redundant_casts = true
diff --git a/pkgs/clan-app/pyproject.toml b/pkgs/clan-app/pyproject.toml
index d35d4416a..55a04543d 100644
--- a/pkgs/clan-app/pyproject.toml
+++ b/pkgs/clan-app/pyproject.toml
@@ -39,22 +39,3 @@ no_implicit_optional = true
 [[tool.mypy.overrides]]
 module = "clan_cli.*"
 ignore_missing_imports = true
-
-[tool.ruff]
-target-version = "py312"
-line-length = 88
-lint.select = [
-  "A",
-  "ANN",
-  "B",
-  "C4",
-  "E",
-  "F",
-  "I",
-  "N",
-  "RUF",
-  "TID",
-  "T100",
-  "U",
-]
-lint.ignore = ["E501", "E402", "N802", "ANN101", "ANN401", "A003"]
diff --git a/pkgs/clan-cli/pyproject.toml b/pkgs/clan-cli/pyproject.toml
index 70df18716..1fa279f2f 100644
--- a/pkgs/clan-cli/pyproject.toml
+++ b/pkgs/clan-cli/pyproject.toml
@@ -64,25 +64,3 @@ ignore_missing_imports = true
 module = "setuptools.*"
 ignore_missing_imports = true
 
-[tool.ruff]
-target-version = "py311"
-line-length = 88
-lint.select = [
-  "A",
-  "ANN",
-  "ASYNC",
-  "B",
-  "C4",
-  "DTZ",
-  "E",
-  "EM",
-  "F",
-  "I",
-  "N",
-  "RUF",
-  "T10",
-  "TID",
-  "U",
-  "YTT",
-]
-lint.ignore = ["E501", "E402", "E731", "ANN101", "ANN401", "A003"]
diff --git a/pkgs/clan-vm-manager/pyproject.toml b/pkgs/clan-vm-manager/pyproject.toml
index 8b75e28b1..5e7c4eeeb 100644
--- a/pkgs/clan-vm-manager/pyproject.toml
+++ b/pkgs/clan-vm-manager/pyproject.toml
@@ -39,23 +39,3 @@ no_implicit_optional = true
 [[tool.mypy.overrides]]
 module = "argcomplete.*"
 ignore_missing_imports = true
-
-
-[tool.ruff]
-target-version = "py311"
-line-length = 88
-lint.select = [
-  "A",
-  "ANN",
-  "B",
-  "C4",
-  "E",
-  "F",
-  "I",
-  "N",
-  "RUF",
-  "TID",
-  "T100",
-  "U",
-]
-lint.ignore = ["E501", "E402", "N802", "ANN101", "ANN401", "A003"]
diff --git a/pyproject.toml b/pyproject.toml
index 5cbc07fc5..e9edbad84 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,20 +8,24 @@ no_implicit_optional = true
 exclude = "clan_cli.nixpkgs"
 
 [tool.ruff]
-line-length = 88
 target-version = "py311"
+line-length = 88
 lint.select = [
   "A",
   "ANN",
+  "ASYNC",
   "B",
   "C4",
+  "DTZ",
   "E",
+  "EM",
   "F",
   "I",
   "N",
   "RUF",
+  "T10",
   "TID",
-  "T100",
   "U",
+  "YTT",
 ]
-lint.ignore = [ "E501", "ANN101", "ANN401", "A003"]
+lint.ignore = ["E501", "E402", "E731", "ANN101", "ANN401", "A003"]