From 8c6c9e334b5f80e46c8e49c0fe28cc3fa322c557 Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Thu, 30 Sep 2021 21:01:41 +0200
Subject: [PATCH] Test with Python 3.10

---
 .github/workflows/tests.yml | 29 +++++++++++++++++++++++++++--
 psycopg/tox.ini             |  2 +-
 psycopg_c/tox.ini           |  2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4294c7b76..a5b5a4f94 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,12 +16,15 @@ jobs:
         include:
           - {impl: python, python: "3.6", postgres: "postgres:10"}
           - {impl: python, python: "3.7", postgres: "postgres:11"}
-          - {impl: python, python: "3.8", postgres: "postgres:13"}
+          - {impl: python, python: "3.8", postgres: "postgres:12"}
+          # Don't test two experimental things together
           - {impl: python, python: "3.9", postgres: "postgres:14rc1"}
+          - {impl: python, python: "3.10", postgres: "postgres:13"}
           - {impl: c, python: "3.6", postgres: "postgres:14rc1"}
           - {impl: c, python: "3.7", postgres: "postgres:13"}
           - {impl: c, python: "3.8", postgres: "postgres:12"}
-          - {impl: c, python: "3.9", postgres: "postgres:10"}
+          - {impl: c, python: "3.9", postgres: "postgres:11"}
+          - {impl: c, python: "3.10", postgres: "postgres:10"}
           - {impl: dns, python: "3.9", postgres: "postgres:13"}
           - {impl: postgis, python: "3.9", postgres: "postgis/postgis:13-master"}
 
@@ -36,6 +39,12 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+        if: ${{ matrix.python != '3.10' }}
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.10.0-alpha - 3.10.0"
+        if: ${{ matrix.python == '3.10' }}
 
       - name: Install tox
         run: pip install tox
@@ -93,10 +102,12 @@ jobs:
           - {impl: python, python: "3.7"}
           - {impl: python, python: "3.8"}
           - {impl: python, python: "3.9"}
+          - {impl: python, python: "3.10"}
           - {impl: c, python: "3.6"}
           - {impl: c, python: "3.7"}
           - {impl: c, python: "3.8"}
           - {impl: c, python: "3.9"}
+          - {impl: c, python: "3.10"}
 
     env:
       PSYCOPG_IMPL: ${{ matrix.impl }}
@@ -118,6 +129,12 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+        if: ${{ matrix.python != '3.10' }}
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.10.0-alpha - 3.10.0"
+        if: ${{ matrix.python == '3.10' }}
 
       - name: Install tox
         run: pip install tox
@@ -145,10 +162,12 @@ jobs:
           - {impl: python, python: "3.7"}
           - {impl: python, python: "3.8"}
           - {impl: python, python: "3.9"}
+          - {impl: python, python: "3.10"}
           - {impl: c, python: "3.6"}
           - {impl: c, python: "3.7"}
           - {impl: c, python: "3.8"}
           - {impl: c, python: "3.9"}
+          - {impl: c, python: "3.10"}
 
     env:
       PSYCOPG_IMPL: ${{ matrix.impl }}
@@ -168,6 +187,12 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+        if: ${{ matrix.python != '3.10' }}
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.10.0-alpha - 3.10.0"
+        if: ${{ matrix.python == '3.10' }}
 
       - name: Install tox
         run: pip install tox wheel
diff --git a/psycopg/tox.ini b/psycopg/tox.ini
index 6ec9d605a..ca264d2a2 100644
--- a/psycopg/tox.ini
+++ b/psycopg/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {3.6,3.7,3.8,3.9}
+envlist = {3.6,3.7,3.8,3.9,3.10}
 isolated_build = True
 
 [testenv]
diff --git a/psycopg_c/tox.ini b/psycopg_c/tox.ini
index 6cc1c1910..72ecce734 100644
--- a/psycopg_c/tox.ini
+++ b/psycopg_c/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {3.6,3.7,3.8,3.9}
+envlist = {3.6,3.7,3.8,3.9,3.10}
 isolated_build = True
 
 [testenv]
-- 
2.47.2