Replace black for ruff format

klaasnicolaas · Dec 30, 2023 · 77356a7 · 77356a7
1 parent 5623141
commit 77356a7
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 151 deletions.
diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml
@@ -54,31 +54,10 @@ jobs:
           poetry config virtualenvs.in-project true
       - name: 🏗 Install Python dependencies
         run: poetry install --no-interaction
-      - name: 🚀 Run Ruff
-        run: poetry run ruff .
-
-  black:
-    name: black
-    runs-on: ubuntu-latest
-    steps:
-      - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v4.1.1
-      - name: 🏗 Set up Poetry
-        run: pipx install poetry
-      - name: 🏗 Set up Python ${{ env.DEFAULT_PYTHON }}
-        id: python
-        uses: actions/setup-python@v5.0.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache: "poetry"
-      - name: 🏗 Install workflow dependencies
-        run: |
-          poetry config virtualenvs.create true
-          poetry config virtualenvs.in-project true
-      - name: 🏗 Install Python dependencies
-        run: poetry install --no-interaction
-      - name: 🚀 Run black on docs
-        run: poetry run blacken-docs
+      - name: 🚀 Run Ruff linter
+        run: poetry run ruff check --output-format=github .
+      - name: 🚀 Run Ruff formatter
+        run: poetry run ruff format --check .
 
   pre-commit-hooks:
     name: pre-commit-hooks
@@ -120,8 +99,6 @@ jobs:
         run: poetry run pre-commit run check-xml --all-files
       - name: 🚀 Check YAML files
         run: poetry run pre-commit run check-yaml --all-files
-      - name: 🚀 Check YAML files
-        run: poetry run pre-commit run check-yaml --all-files
       - name: 🚀 Detect Private Keys
         run: poetry run pre-commit run detect-private-key --all-files
       - name: 🚀 Check End of Files

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,25 +2,20 @@
 repos:
   - repo: local
     hooks:
-      - id: ruff
-        name: 🐶 Ruff
+      - id: ruff-check
+        name: 🐶 Ruff Linter
         language: system
         types: [python]
-        entry: poetry run ruff --fix
+        entry: poetry run ruff check --fix
         require_serial: true
         stages: [commit, push, manual]
-      - id: black
-        name: ☕️ Format using black
+      - id: ruff-format
+        name: 🐶 Ruff Formatter
         language: system
         types: [python]
-        entry: poetry run black
-        require_serial: true
-      - id: blacken-docs
-        name: ☕️ Format documentation examples using black
-        language: system
-        files: '\.(rst|md|markdown|py|tex)$'
-        entry: poetry run blacken-docs
+        entry: poetry run ruff format
         require_serial: true
+        stages: [commit, push, manual]
       - id: check-ast
         name: 🐍 Check Python AST
         language: system
@@ -63,7 +58,7 @@ repos:
         entry: poetry run check-toml
       - id: check-xml
         name: ✅ Check XML files
-        entry: check-xml
+        entry: poetry run check-xml
         language: system
         types: [xml]
       - id: check-yaml