From fbc7cf4ee587ebf8ae79b4385f0d53f6a5ac0b41 Mon Sep 17 00:00:00 2001
From: Alex Parsons <alex.parsons@mysociety.org>
Date: Thu, 16 May 2024 11:29:43 +0100
Subject: [PATCH] Update template

---
 .github/workflows/test.yml                    |  9 +++++---
 .../.devcontainer/devcontainer.json           | 23 +++++++++++--------
 {{cookiecutter.hyphenated}}/pyproject.toml    |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 93d6e77..8f79c6c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.9", "3.10"]
-        poetry-version: ["1.2"]
+        poetry-version: ["1.8"]
 
     runs-on: ubuntu-latest
 
@@ -47,5 +47,8 @@ jobs:
     - name: Test with pyright
       uses: jakebailey/pyright-action@v1
 
-    - name: Test with black
-      uses: psf/black@stable
\ No newline at end of file
+    - name: Test with ruff
+      shell: bash
+      run: |
+        python -m ruff .
+        python -m ruff format --check .
diff --git a/{{cookiecutter.hyphenated}}/.devcontainer/devcontainer.json b/{{cookiecutter.hyphenated}}/.devcontainer/devcontainer.json
index 811b9c6..6a0b1f1 100644
--- a/{{cookiecutter.hyphenated}}/.devcontainer/devcontainer.json
+++ b/{{cookiecutter.hyphenated}}/.devcontainer/devcontainer.json
@@ -3,13 +3,18 @@
 	"build": {
 		"dockerfile": "../Dockerfile"
 	},
-	"extensions": [	
-		"ms-vscode.test-adapter-converter",
-		"bungcip.better-toml",
-		"ms-python.python",
-		"ms-python.vscode-pylance",
-		"ms-azuretools.vscode-docker",
-		"valentjn.vscode-ltex",
-		"mhutchie.git-graph"
-	]
+	"customizations": {
+		"vscode": {
+			"extensions": [	
+				"ms-vscode.test-adapter-converter",
+				"bungcip.better-toml",
+				"ms-python.python",
+				"ms-python.vscode-pylance",
+				"ms-azuretools.vscode-docker",
+				"valentjn.vscode-ltex",
+				"mhutchie.git-graph",
+				"charliermarsh.ruff"
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/{{cookiecutter.hyphenated}}/pyproject.toml b/{{cookiecutter.hyphenated}}/pyproject.toml
index 5c211da..21a3ba4 100644
--- a/{{cookiecutter.hyphenated}}/pyproject.toml
+++ b/{{cookiecutter.hyphenated}}/pyproject.toml
@@ -20,7 +20,7 @@ python = "^3.8"
 pytest = "^7.1.2"
 pytest-cov = "^3.0.0"
 pylint = "^2.12.2"
-black = "^22.3.0"
+ruff = "^0.4.4"
 pyright = "^1.1"
 toml = "^0.10.2"