From 6121f75223ba273d8b6f572e0bdb9168ef3b4f0c Mon Sep 17 00:00:00 2001
From: Andrew Godwin
Date: Sun, 20 Nov 2022 11:54:23 -0700
Subject: Fix up lint more, and bump down to 3.10 as min req

---
 .github/workflows/test.yml | 19 +++----------------
 .readthedocs.yaml          |  2 +-
 CONTRIBUTING.md            |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 21bc192..41a0899 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,10 +16,10 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.11
+      - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.10"
           cache: pip
       - name: Install dependencies
         run: |
@@ -33,19 +33,6 @@ jobs:
           PGPASSWORD: postgres
         run: |
           python -m pytest
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-          cache: pip
-      - name: Install dependencies
-        run: |
-          python -m pip install -r requirements-dev.txt
       - name: Run pre-commit
         run: |
-          pre-commit run -a
+          pre-commit run -a --show-diff-on-failure
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 01418e4..1521f19 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -4,7 +4,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.10"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 451d7d4..ba7559b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ Development can be done "bare metal" or with Docker.  We'll describe both here.
 
 ### Bare Metal
 
-Takahē requires Python 3.11, so you'll need that first.  Then, create and
+Takahē requires Python 3.10 or above, so you'll need that first.  Then, create and
 activate a virtual environment:
 
 ```shell
-- 
cgit v1.2.3