From 06a7aecbfeb75307d941beee3a7dec2e54fbd255 Mon Sep 17 00:00:00 2001
From: Tom Ritchford <tom@swirly.com>
Date: Tue, 16 Jan 2024 13:14:44 +0100
Subject: [PATCH] Replace isort and black with ruff

---
 .github/workflows/python-package.yml | 66 ++++++++++------------------
 pyproject.toml                       |  6 +++
 2 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index d43a888..fe9016a 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -1,53 +1,35 @@
-name: Python package
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.8", "3.12"]
-
     steps:
-    - uses: actions/checkout@v3
-
+    - {uses: actions/checkout@v3}
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
+      with: {python-version: '${{ matrix.python-version }}'}
     - name: cache poetry install
       uses: actions/cache@v2
-      with:
-        path: ~/.local
-        key: poetry-1.7.1-0
-
+      with: {key: poetry-1.7.1-0, path: ~/.local}
     - name: Install Poetry
       uses: snok/install-poetry@v1
-      with:
-          version: 1.7.1
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-
-    - name: cache deps
-      id: cache-deps
+      with: {version: 1.7.1, virtualenvs-create: true, virtualenvs-in-project: true}
+    - id: cache-deps
+      name: cache deps
       uses: actions/cache@v2
-      with:
-        path: .venv
-        key: pydeps-${{ hashFiles('**/poetry.lock') }}
-
-    - run: poetry install --no-interaction --no-root
-      if: steps.cache-deps.outputs.cache-hit != 'true'
-
-    - run: poetry install --no-interaction
-
-    - run: poetry run mypy tdir
-    - run: poetry run ruff check tdir test_tdir.py
-    - run: poetry run pytest
+      with: {key: "pydeps-${{ hashFiles('**/poetry.lock') }}", path: .venv}
+    - {if: steps.cache-deps.outputs.cache-hit != 'true', run: poetry install --no-interaction
+        --no-root}
+    - {run: poetry install --no-interaction}
+    - {run: poetry run mypy tdir}
+    - {run: poetry run ruff check --select I --fix tdir test_tdir.py}
+    - {run: poetry run ruff format}
+    - {run: poetry run pytest}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.8', '3.12']
+name: Python package
+on:
+  pull_request:
+    branches: [main]
+  push:
+    branches: [main]
diff --git a/pyproject.toml b/pyproject.toml
index d7c23d4..db1fbbf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,6 +46,12 @@ exclude_lines = [
     "if __name__ == .__main__.:",
     "raise NotImplementedError",
 ]
+
+[tool.ruff]
+line-length = 88
+
+[tool.ruff.format]
+quote-style = "single"
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"