From 4a46aa39a5842887f100ad1fafad55d207497f40 Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 5 Oct 2021 00:44:09 +0200
Subject: [PATCH] Build Python 3.10 packages of relase 2.9.1

---
 .appveyor/packages.yml                |  2 ++
 .github/workflows/packages.yml        |  4 ++--
 .github/workflows/tests.yml           | 24 ++++++++++--------------
 scripts/build/appveyor.py             |  3 ++-
 scripts/build/build_manylinux_2_24.sh |  2 +-
 tox.ini                               |  2 +-
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.appveyor/packages.yml b/.appveyor/packages.yml
index db6ccd58..5822e569 100644
--- a/.appveyor/packages.yml
+++ b/.appveyor/packages.yml
@@ -11,6 +11,8 @@ environment:
     matrix:
         # For Python versions available on Appveyor, see
         # https://www.appveyor.com/docs/windows-images-software/#python
+        - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "32"}
+        - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "64"}
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "32"}
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "64"}
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "32"}
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 137e91c2..4fd6cb81 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -75,7 +75,7 @@ jobs:
           docker run --rm
           -e PLAT=${{ matrix.tag }}_${{ matrix.arch }}
           -e PACKAGE_NAME=psycopg2-binary
-          -e PYVERS="cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39"
+          -e PYVERS="cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310"
           -e PSYCOPG2_TESTDB=postgres
           -e PSYCOPG2_TESTDB_HOST=172.17.0.1
           -e PSYCOPG2_TESTDB_USER=postgres
@@ -113,7 +113,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
       - name: Checkout repos
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 13641051..a913cf55 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,22 +13,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python: 3.6
-            postgres: 10
-          - python: 3.7
-            postgres: 11
-          - python: 3.8
-            postgres: 12
-          - python: 3.9
-            postgres: 13
+          - {python: "3.6", postgres: "10"}
+          - {python: "3.7", postgres: "11"}
+          - {python: "3.8", postgres: "12"}
+          - {python: "3.9", postgres: "13"}
+          - {python: "3.10", postgres: "14"}
 
           # Opposite extremes of the supported Py/PG range, other architecture
-          - python: 3.6
-            postgres: 13
-            architecture: 'x86'
-          - python: 3.9
-            postgres: 9.5
-            architecture: 'x86'
+          - {python: "3.6", postgres: "14", architecture: "x86"}
+          - {python: "3.7", postgres: "13", architecture: "x86"}
+          - {python: "3.8", postgres: "12", architecture: "x86"}
+          - {python: "3.9", postgres: "11", architecture: "x86"}
+          - {python: "3.10", postgres: "10", architecture: "x86"}
 
     env:
       PSYCOPG2_TESTDB: postgres
diff --git a/scripts/build/appveyor.py b/scripts/build/appveyor.py
index 39b3ebe2..bd650074 100755
--- a/scripts/build/appveyor.py
+++ b/scripts/build/appveyor.py
@@ -661,7 +661,7 @@ class Options:
     def py_ver(self):
         """The Python version to build as 2 digits string."""
         rv = os.environ['PY_VER']
-        assert rv in ('36', '37', '38', '39'), rv
+        assert rv in ('36', '37', '38', '39', '310'), rv
         return rv
 
     @property
@@ -747,6 +747,7 @@ class Options:
             '37': '14.0',
             '38': '14.0',
             '39': '16.0',
+            '310': '16.0',
         }
         return vsvers[self.py_ver]
 
diff --git a/scripts/build/build_manylinux_2_24.sh b/scripts/build/build_manylinux_2_24.sh
index d83c8414..6a9e992b 100755
--- a/scripts/build/build_manylinux_2_24.sh
+++ b/scripts/build/build_manylinux_2_24.sh
@@ -27,7 +27,7 @@ if [[ "${PACKAGE_NAME:-}" ]]; then
 fi
 
 # Install prerequisite libraries
-curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+curl -k -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 echo "deb http://apt.postgresql.org/pub/repos/apt stretch-pgdg main" \
     > /etc/apt/sources.list.d/pgdg.list
 apt-get -y update
diff --git a/tox.ini b/tox.ini
index 74faa1a5..8bb56694 100644
--- a/tox.ini
+++ b/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}
 
 [testenv]
 commands = make check