From 898cbff5a6d1f8215d39d369581bc00ad22540da Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Thu, 11 Nov 2021 20:14:04 +0100 Subject: Build binary packages against PosgtgreSQL 14.1 lipq Close #1388. --- .appveyor/packages.yml | 4 ++-- .appveyor/tests.yml | 4 ++-- NEWS | 2 ++ scripts/build/appveyor.cache_rebuild | 4 ++-- scripts/build/build_libpq.sh | 4 ++-- scripts/build/build_macos.sh | 5 ++++- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.appveyor/packages.yml b/.appveyor/packages.yml index cc1fae5..5faf67a 100644 --- a/.appveyor/packages.yml +++ b/.appveyor/packages.yml @@ -24,8 +24,8 @@ environment: WORKFLOW: packages - OPENSSL_VERSION: "1_1_1k" - POSTGRES_VERSION: "13_3" + OPENSSL_VERSION: "1_1_1l" + POSTGRES_VERSION: "14_1" PSYCOPG2_TESTDB: psycopg2_test PSYCOPG2_TESTDB_USER: postgres diff --git a/.appveyor/tests.yml b/.appveyor/tests.yml index 22090b8..21ed9ee 100644 --- a/.appveyor/tests.yml +++ b/.appveyor/tests.yml @@ -19,8 +19,8 @@ environment: WORKFLOW: tests - OPENSSL_VERSION: "1_1_1k" - POSTGRES_VERSION: "13_3" + OPENSSL_VERSION: "1_1_1l" + POSTGRES_VERSION: "14_1" PSYCOPG2_TESTDB: psycopg2_test PSYCOPG2_TESTDB_USER: postgres diff --git a/NEWS b/NEWS index e8e64df..f462fc1 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ What's new in psycopg 2.9.2 - Raise `ValueError` for dates >= Y10k (:ticket:`#1307`). - `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to PostgreSQL 14. +- Wheel package compiled against OpenSSL 1.1.1l and PostgreSQL 14.1 + (:ticket:`#1388`). What's new in psycopg 2.9.1 diff --git a/scripts/build/appveyor.cache_rebuild b/scripts/build/appveyor.cache_rebuild index d4d2ed2..6853579 100644 --- a/scripts/build/appveyor.cache_rebuild +++ b/scripts/build/appveyor.cache_rebuild @@ -9,10 +9,10 @@ To invalidate the cache, update this file and check it into git. Currently used modules built in the cache: OpenSSL - Version: 1.1.1k + Version: 1.1.1l PostgreSQL - Version: 13.3 + Version: 14.1 NOTE: to zap the cache manually you can also use: diff --git a/scripts/build/build_libpq.sh b/scripts/build/build_libpq.sh index 32d2222..3d297ad 100755 --- a/scripts/build/build_libpq.sh +++ b/scripts/build/build_libpq.sh @@ -5,10 +5,10 @@ set -euo pipefail set -x -openssl_version="1.1.1k" +openssl_version="1.1.1l" ldap_version="2.4.59" sasl_version="2.1.27" -postgres_version="13.3" +postgres_version="14.1" yum install -y zlib-devel krb5-devel pam-devel diff --git a/scripts/build/build_macos.sh b/scripts/build/build_macos.sh index 0fe4b56..73b6d77 100755 --- a/scripts/build/build_macos.sh +++ b/scripts/build/build_macos.sh @@ -11,7 +11,10 @@ set -x dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" prjdir="$( cd "${dir}/../.." && pwd )" -brew install gnu-sed postgresql@13 +brew update +brew install gnu-sed postgresql@14 +# Fetch 14.1 if 14.0 is still the default version +brew reinstall postgresql # Start the database for testing brew services start postgresql -- cgit v1.2.1