From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 3 Oct 2023 11:19:35 +0000 (+0200)
Subject: ci: add Python 3.12 packages build
X-Git-Tag: pool-3.1.9~12^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e786ed253bd5b0676b25c20442125d9537b35cb;p=thirdparty%2Fpsycopg.git

ci: add Python 3.12 packages build
---

diff --git a/.github/workflows/packages-bin.yml b/.github/workflows/packages-bin.yml
index e118ef0ca..123c75cb1 100644
--- a/.github/workflows/packages-bin.yml
+++ b/.github/workflows/packages-bin.yml
@@ -19,9 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x86_64, i686, ppc64le, aarch64]
-        # NOMERGE: one-off build of cp312 packages
-        # pyver: [cp37, cp38, cp39, cp310, cp311]
-        pyver: [cp312]
+        pyver: [cp37, cp38, cp39, cp310, cp311, cp312]
         platform: [manylinux, musllinux]
 
     steps:
@@ -103,9 +101,7 @@ jobs:
       matrix:
         # These archs require an Apple M1 runner: [arm64, universal2]
         arch: [x86_64]
-        # NOMERGE: one-off build of cp312 packages
-        # pyver: [cp37, cp38, cp39, cp310, cp311]
-        pyver: [cp312]
+        pyver: [cp37, cp38, cp39, cp310, cp311, cp312]
 
     steps:
       - uses: actions/checkout@v3
@@ -148,9 +144,7 @@ jobs:
       matrix:
         # Might want to add win32, untested at the moment.
         arch: [win_amd64]
-        # NOMERGE: one-off build of cp312 packages
-        # pyver: [cp37, cp38, cp39, cp310, cp311]
-        pyver: [cp312]
+        pyver: [cp37, cp38, cp39, cp310, cp311, cp312]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/tools/build/build_macos_arm64.sh b/tools/build/build_macos_arm64.sh
index 01eccc678..2219fc623 100755
--- a/tools/build/build_macos_arm64.sh
+++ b/tools/build/build_macos_arm64.sh
@@ -10,9 +10,7 @@
 set -euo pipefail
 # set -x
 
-# NOMERGE: one-off build of cp312 packages
-# python_versions="3.8.10 3.9.13 3.10.5 3.11.0"
-python_versions="3.12.0"
+python_versions="3.8.10 3.9.13 3.10.5 3.11.0 3.12.0"
 pg_version=16
 
 function log {
@@ -95,9 +93,7 @@ python tools/build/copy_to_binary.py
 # Build the binary packages
 export CIBW_PLATFORM=macos
 export CIBW_ARCHS=arm64
-# NOMERGE: one-off build of cp312 packages
-# export CIBW_BUILD='cp{38,39,310,311}-*'
-export CIBW_BUILD='cp312-*'
+export CIBW_BUILD='cp{38,39,310,311,312}-*'
 export CIBW_TEST_REQUIRES="./psycopg[test] ./psycopg_pool"
 export CIBW_TEST_COMMAND="pytest {project}/tests -m 'not slow and not flakey' --color yes"