From 763be0f9804c3a6bb57a5045fad333e50151a02b Mon Sep 17 00:00:00 2001
From: Stef Piatek <s.piatek@ucl.ac.uk>
Date: Wed, 13 Dec 2023 12:21:05 +0000
Subject: [PATCH] Ruff tweaks (#178)

* Use pyproject.toml for ruff config where possible

One less file to track, not strongly held opinion if
there are arguments against it

* Run ruff format before ruff check in precommit

That way any that can be fixed are checked before linting
---
 .pre-commit-config.yaml  | 4 +---
 hasher/pyproject.toml    | 7 +++++++
 hasher/ruff.toml         | 5 -----
 pixl_core/pyproject.toml | 6 ++++++
 pixl_core/ruff.toml      | 4 ----
 pixl_ehr/pyproject.toml  | 6 ++++++
 pixl_ehr/ruff.toml       | 4 ----
 pixl_pacs/pyproject.toml | 6 ++++++
 pixl_pacs/ruff.toml      | 4 ----
 9 files changed, 26 insertions(+), 20 deletions(-)
 delete mode 100644 hasher/ruff.toml
 delete mode 100644 pixl_core/ruff.toml
 delete mode 100644 pixl_ehr/ruff.toml
 delete mode 100644 pixl_pacs/ruff.toml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 616bed3de..677af01a1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,12 +16,10 @@ repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.6
     hooks:
+      - id: ruff-format
       - id: ruff
         args:
           - --fix
-      - id: ruff-format
-        args:
-          - --config=ruff.toml
 
   - repo: local
     hooks:
diff --git a/hasher/pyproject.toml b/hasher/pyproject.toml
index 5527d11dc..072770144 100644
--- a/hasher/pyproject.toml
+++ b/hasher/pyproject.toml
@@ -34,3 +34,10 @@ dev = [
 [build-system]
 requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
+
+[tool.ruff]
+extend = "../ruff.toml"
+
+[tool.ruff.extend-per-file-ignores]
+"./tests/**" = ["D1"]
+"./src/hasher/endpoints.py" = ["D103"]
diff --git a/hasher/ruff.toml b/hasher/ruff.toml
deleted file mode 100644
index a05994738..000000000
--- a/hasher/ruff.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-extend = "../ruff.toml"
-
-[extend-per-file-ignores]
-"./tests/**" = ["D1"]
-"./src/hasher/endpoints.py" = ["D103"]
diff --git a/pixl_core/pyproject.toml b/pixl_core/pyproject.toml
index 5233a1b9c..4fca9032c 100644
--- a/pixl_core/pyproject.toml
+++ b/pixl_core/pyproject.toml
@@ -38,3 +38,9 @@ build-backend = "setuptools.build_meta"
 
 [tool.pytest.ini_options]
 markers = ["pika"]
+
+[tool.ruff]
+extend = "../ruff.toml"
+
+[tool.ruff.extend-per-file-ignores]
+"./tests/**" = ["D100"]
diff --git a/pixl_core/ruff.toml b/pixl_core/ruff.toml
deleted file mode 100644
index 595536403..000000000
--- a/pixl_core/ruff.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-extend = "../ruff.toml"
-
-[extend-per-file-ignores]
-"./tests/**" = ["D100"]
diff --git a/pixl_ehr/pyproject.toml b/pixl_ehr/pyproject.toml
index 03b472e74..c8a0912dd 100644
--- a/pixl_ehr/pyproject.toml
+++ b/pixl_ehr/pyproject.toml
@@ -39,5 +39,11 @@ build-backend = "setuptools.build_meta"
 [tool.pytest.ini_options]
 markers = ["processing"]
 
+[tool.ruff]
+extend = "../ruff.toml"
+
+[tool.ruff.extend-per-file-ignores]
+"./tests/**" = ["D1"]
+
 [tool.setuptools.package-data]
 pixl_ehr = ["sql/*.sql", "report_deid/*.txt"]
diff --git a/pixl_ehr/ruff.toml b/pixl_ehr/ruff.toml
deleted file mode 100644
index 0893bd001..000000000
--- a/pixl_ehr/ruff.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-extend = "../ruff.toml"
-
-[extend-per-file-ignores]
-"./tests/**" = ["D1"]
diff --git a/pixl_pacs/pyproject.toml b/pixl_pacs/pyproject.toml
index b596cd9a5..3ca67a354 100644
--- a/pixl_pacs/pyproject.toml
+++ b/pixl_pacs/pyproject.toml
@@ -34,3 +34,9 @@ build-backend = "setuptools.build_meta"
 
 [tool.pytest.ini_options]
 markers = ["processing"]
+
+[tool.ruff]
+extend = "../ruff.toml"
+
+[tool.ruff.extend-per-file-ignores]
+"./tests/**" = ["D1"]
diff --git a/pixl_pacs/ruff.toml b/pixl_pacs/ruff.toml
deleted file mode 100644
index 0893bd001..000000000
--- a/pixl_pacs/ruff.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-extend = "../ruff.toml"
-
-[extend-per-file-ignores]
-"./tests/**" = ["D1"]