From cfc5f7e34d3853f35c2a446d65bec215b0a6b1a3 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 10 Apr 2024 23:31:31 +0100
Subject: [PATCH 1/3] CI: Fix bitrot and deprecation warnings.

---
 .github/workflows/build.yml | 6 +++---
 .github/workflows/qa.yml    | 4 ++--
 tox.ini                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddee38e..29c9c52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
@@ -35,7 +35,7 @@ jobs:
           make dist
 
       - name: Upload Packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.RELEASE_FILE }}
           path: dist/
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index 18305d2..cfa3bf4 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python '3,11'
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
diff --git a/tox.ini b/tox.ini
index 090fdb0..44ab1a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ commands =
 	python -m build --no-isolation
 	python -m twine check dist/*
 	isort --check .
-	ruff --format=github .
+	ruff check --output-format=github .
 	codespell .
 deps =
 	check-manifest

From 77cc1c7c3d0ffc5e13d4f4a7e2390a0b37c2887d Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 10 Apr 2024 23:52:47 +0100
Subject: [PATCH 2/3] CI: Set TERM to avoid tooling errors.

---
 .github/workflows/build.yml | 1 +
 .github/workflows/qa.yml    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29c9c52..a1572a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,7 @@ jobs:
 
     env:
       RELEASE_FILE: ${{ github.event.repository.name }}-${{ github.event.release.tag_name || github.sha }}-py${{ matrix.python }}
+      TERM: xterm-256color
 
     steps:
       - name: Checkout Code
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index cfa3bf4..c145740 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -10,6 +10,8 @@ jobs:
   test:
     name: linting & spelling
     runs-on: ubuntu-latest
+    env:
+      TERM: xterm-256color
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

From f0ab14ba67a60fcc4968ceea0bb9f7eca02c34bc Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 10 Apr 2024 23:55:47 +0100
Subject: [PATCH 3/3] CI: Use correct build command.

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1572a9..83e2bee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Build Packages
         run: |
-          make dist
+          make build
 
       - name: Upload Packages
         uses: actions/upload-artifact@v4