Use pre-commit to test style

equinor · Nov 30, 2023 · 8e823a9 · 8e823a9
1 parent 31a4b1e
commit 8e823a9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -43,11 +43,7 @@ jobs:
     - name: Add matching rule
       run: echo ::add-matcher::.github/flake8-matcher.json
 
-    - name: Run ruff
+    - name: Run style check
       if: ${{ always() }}
       run: |
-        ruff check .
-
-    - name: Run black
-      if: ${{ always() }}
-      uses: psf/black@stable
+        pre-commit run --all-files --show-diff-on-failure
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@
 *.user.*
 .nfs*
 *.swp
-.pre-commit-config.yaml
 .idea
 .vscode
 .pytest_cache

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,19 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.5.0
+    hooks:
+    -   id: check-json
+    -   id: check-yaml
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.6
+    hooks:
+    - id: ruff
+      args: [ --fix ]
+
+-   repo: https://github.com/ambv/black
+    rev: 23.11.0
+    hooks:
+    - id: black
diff --git a/pyproject.toml b/pyproject.toml
@@ -121,8 +121,7 @@ dev = [
 ]
 style = [
     "cmake-format",
-    "black",
-    "ruff",
+    "pre-commit",
 ]
 types = [
     "mypy",