chore: build binary packages using libpq from PostgreSQL 15

fix #1497 as a side effect of using libpq 15.

7 files changed, 15 insertions, 12 deletions

diff --git a/.appveyor/cache_rebuild b/.appveyor/cache_rebuild
index fd9a424..cf3dc98 100644
--- a/.appveyor/cache_rebuild
+++ b/.appveyor/cache_rebuild
@@ -9,7 +9,7 @@ To invalidate the cache, update this file and check it into git.
 Currently used modules built in the cache:
 
 - OPENSSL_VERSION: 1.1.1q
-- POSTGRES_VERSION: 14.4
+- POSTGRES_VERSION: 15.0
 
 
 NOTE: to zap the cache manually you can also use:
diff --git a/.appveyor/packages.yml b/.appveyor/packages.yml
index 5220652..4bf6d5b 100644
--- a/.appveyor/packages.yml
+++ b/.appveyor/packages.yml
@@ -25,7 +25,7 @@ environment:
     WORKFLOW: packages
 
     OPENSSL_VERSION: "1_1_1q"
-    POSTGRES_VERSION: "14_4"
+    POSTGRES_VERSION: "15_0"
 
     PSYCOPG2_TESTDB: psycopg2_test
     PSYCOPG2_TESTDB_USER: postgres
diff --git a/.appveyor/tests.yml b/.appveyor/tests.yml
index 3fa7634..2436f59 100644
--- a/.appveyor/tests.yml
+++ b/.appveyor/tests.yml
@@ -20,7 +20,7 @@ environment:
     WORKFLOW: tests
 
     OPENSSL_VERSION: "1_1_1q"
-    POSTGRES_VERSION: "14_4"
+    POSTGRES_VERSION: "15_0"
 
     PSYCOPG2_TESTDB: psycopg2_test
     PSYCOPG2_TESTDB_USER: postgres
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c89140c..f7d225e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -51,13 +51,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: install libpq 15
-        # TODO: disable after PostgreSQL 15 has been released officially.
-        if: true
+      # Can enable to test an unreleased libpq version.
+      - name: install libpq 16
+        if false:
         run: |
           set -x
           rel=$(lsb_release -c -s)
-          echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main 15" \
+          echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main 16" \
             | sudo tee -a /etc/apt/sources.list.d/pgdg.list
           sudo apt-get -qq update
           pqver=$(apt-cache show libpq5  | grep ^Version: | head -1 \
diff --git a/NEWS b/NEWS
index 2d9d47d..bc0d160 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ What's new in psycopg 2.9.5
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Add support for Python 3.11.
+- Add support for rowcount in MERGE statements in binary packages
+  (:ticket:`#1497`).
+- Wheel package compiled against OpenSSL 1.1.1q and PostgreSQL 15 libpq.
 
 
 What's new in psycopg 2.9.4
@@ -18,7 +21,7 @@ What's new in psycopg 2.9.4
   binary packages (:ticket:`#1365`).
 - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to
   PostgreSQL 15.
-- Wheel package compiled against OpenSSL 1.1.1q and PostgreSQL 14.4
+- Wheel package compiled against OpenSSL 1.1.1q and PostgreSQL 14.4 libpq.
 
 
 What's new in psycopg 2.9.3
@@ -35,7 +38,7 @@ What's new in psycopg 2.9.2
 - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to
   PostgreSQL 14.
 - Add preliminary support for Python 3.11 (:tickets:`#1376, #1386`).
-- Wheel package compiled against OpenSSL 1.1.1l and PostgreSQL 14.1
+- Wheel package compiled against OpenSSL 1.1.1l and PostgreSQL 14.1 libpq
   (:ticket:`#1388`).
 
 
@@ -72,7 +75,7 @@ Other changes:
   platforms.
 - Provide :pep:`600` wheels packages (manylinux_2_24 tag) for aarch64 and
   ppc64le platforms.
-- Wheel package compiled against OpenSSL 1.1.1k and PostgreSQL 13.3.
+- Wheel package compiled against OpenSSL 1.1.1k and PostgreSQL 13.3 libpq.
 - Build system for Linux/MacOS binary packages moved to GitHub Actions.
 
 
diff --git a/scripts/build/build_libpq.sh b/scripts/build/build_libpq.sh
index 3b04072..f36cb3d 100755
--- a/scripts/build/build_libpq.sh
+++ b/scripts/build/build_libpq.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 set -x
 
 # Last release: https://www.postgresql.org/ftp/source/
-postgres_version="14.4"
+postgres_version="15.0"
 # last release: https://www.openssl.org/source/
 openssl_version="1.1.1q"
 # last release: https://openldap.org/software/download/
diff --git a/scripts/build/build_macos_arm64.sh b/scripts/build/build_macos_arm64.sh
index 4ad7f2b..9fde430 100755
--- a/scripts/build/build_macos_arm64.sh
+++ b/scripts/build/build_macos_arm64.sh
@@ -11,7 +11,7 @@ set -euo pipefail
 set -x
 
 python_versions="3.8.10 3.9.13 3.10.5 3.11"
-postgres_version=14
+postgres_version=15
 
 # Move to the root of the project
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"