Resolve merge conflict

.github/workflows/release.yaml

@@ -12,9 +12,9 @@ jobs:
 
     steps:
       - uses: "actions/checkout@v3"
-      - uses: "actions/setup-python@v1"
+      - uses: "actions/setup-python@v5"
         with:
-          python-version: 3.7
+          python-version: 3.13
       - name: "Install dependencies"
         run: "pip install -r requirements/dev-requirements.txt"
       - name: "Publish to PyPI"

.github/workflows/tests.yaml

@@ -2,22 +2,26 @@ name: Test Suite
 
 on:
     push:
-        branches: ["master"]
+        branches: ["master", "v1"]
+        paths-ignore:
+          - "docs/**"
     pull_request:
-        branches: ["master"]
+        branches: ["master", "v1"]
+        paths-ignore:
+            - "docs/**"
 
 jobs:
     linters:
         runs-on: ubuntu-latest
-        timeout-minutes: 30
+        timeout-minutes: 60
         strategy:
             matrix:
-                python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+                python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v3
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
@@ -31,13 +35,13 @@ jobs:
 
     integration:
         runs-on: ubuntu-latest
-        timeout-minutes: 30
+        timeout-minutes: 60
         strategy:
             matrix:
                 # These tests are slow, so we only run on the latest Python
                 # version.
-                python-version: ["3.10"]
-                postgres-version: [14]
+                python-version: ["3.12"]
+                postgres-version: [17]
         services:
             postgres:
                 image: postgres:${{ matrix.postgres-version }}
@@ -53,7 +57,7 @@ jobs:
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v3
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
@@ -78,11 +82,11 @@ jobs:
 
     postgres:
         runs-on: ubuntu-latest
-        timeout-minutes: 30
+        timeout-minutes: 60
         strategy:
             matrix:
-                python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-                postgres-version: [10, 11, 12, 13, 14, 15]
+                python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+                postgres-version: [12, 13, 14, 15, 16, 17]
 
         # Service containers to run with `container-job`
         services:
@@ -105,7 +109,7 @@ jobs:
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v3
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
@@ -130,19 +134,19 @@ jobs:
                   PG_PASSWORD: postgres
             - name: Upload coverage
               uses: codecov/codecov-action@v1
-              if: matrix.python-version == '3.7'
+              if: matrix.python-version == '3.13'
 
     cockroach:
         runs-on: ubuntu-latest
-        timeout-minutes: 30
+        timeout-minutes: 60
         strategy:
             matrix:
-                python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-                cockroachdb-version: ["v22.2.0"]
+                python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+                cockroachdb-version: ["v24.1.0"]
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v3
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
@@ -164,19 +168,19 @@ jobs:
                   PG_DATABASE: piccolo
             - name: Upload coverage
               uses: codecov/codecov-action@v1
-              if: matrix.python-version == '3.7'
+              if: matrix.python-version == '3.13'
 
     sqlite:
         runs-on: ubuntu-latest
-        timeout-minutes: 30
+        timeout-minutes: 60
         strategy:
             matrix:
-                python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+                python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v3
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
@@ -189,4 +193,4 @@ jobs:
               run: ./scripts/test-sqlite.sh
             - name: Upload coverage
               uses: codecov/codecov-action@v1
-              if: matrix.python-version == '3.7'
+              if: matrix.python-version == '3.13'

.readthedocs.yaml

@@ -0,0 +1,21 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+sphinx:
+   configuration: docs/src/conf.py
+
+formats:
+   - pdf
+   - epub
+
+python:
+   install:
+   - requirements: requirements/readthedocs-requirements.txt