From 551e283aded02991393b860fa15ff613d0ff2b93 Mon Sep 17 00:00:00 2001 From: snowman2 Date: Tue, 16 Sep 2025 15:55:53 -0500 Subject: [PATCH] WHL: Wheels contain PROJ 9.7.0 --- .github/workflows/release.yaml | 2 +- .github/workflows/tests.yaml | 4 +++- ci/proj-compile-wheels.sh | 10 +++++----- ci/vcpkg.json | 6 +++--- docs/history.rst | 1 + 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 36b685073..c9e37a227 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,7 +15,7 @@ concurrency: cancel-in-progress: true env: - PROJ_VERSION: "9.5.1" + PROJ_VERSION: "9.7.0" DEBIAN_FRONTEND: noninteractive jobs: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 891267137..bc77b3085 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -41,8 +41,10 @@ jobs: fail-fast: false matrix: python-version: ['3.11', '3.12', '3.13'] - proj-version: ['9.6.0'] + proj-version: ['9.7.0'] include: + - python-version: '3.11' + proj-version: '9.6.0' - python-version: '3.11' proj-version: '9.5.1' - python-version: '3.11' diff --git a/ci/proj-compile-wheels.sh b/ci/proj-compile-wheels.sh index a09c0e481..895f5b5a3 100644 --- a/ci/proj-compile-wheels.sh +++ b/ci/proj-compile-wheels.sh @@ -1,9 +1,9 @@ # INSTALL PROJ & DEPENDENCIES FOR WHEELS # Test for macOS with [ -n "$IS_MACOS" ] -SQLITE_VERSION=3460100 -LIBTIFF_VERSION=4.6.0 -CURL_VERSION=8.6.0 -NGHTTP2_VERSION=1.60.0 +SQLITE_VERSION=3500400 +LIBTIFF_VERSION=4.7.0 +CURL_VERSION=8.16.0 +NGHTTP2_VERSION=1.67.1 # ------------------------------------------ @@ -289,7 +289,7 @@ function build_sqlite { CFLAGS="$CFLAGS -DHAVE_PREAD64 -DHAVE_PWRITE64" fi if [ -e sqlite-stamp ]; then return; fi - build_simple sqlite-autoconf $SQLITE_VERSION https://www.sqlite.org/2024 + build_simple sqlite-autoconf $SQLITE_VERSION https://www.sqlite.org/2025 touch sqlite-stamp } diff --git a/ci/vcpkg.json b/ci/vcpkg.json index 07a9755bb..2131a7be9 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -1,11 +1,11 @@ { "name": "pyproj", - "version": "3.7.1", + "version": "3.8.0", "dependencies": [ { "name": "proj", - "version>=": "9.5.1" + "version>=": "9.7.0" } ], - "builtin-baseline": "4ec74919dbf24931b29347b000c74374e8bbde35" + "builtin-baseline": "5cec4ba35226bc17ba40b403a7defb0181a21dd4" } diff --git a/docs/history.rst b/docs/history.rst index 7f1b31007..4115e23d1 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -3,6 +3,7 @@ Change Log Latest ------ +- WHL: Wheels contain PROJ 9.7.0 (pull #1529) - ENH: Add :meth:`database.query_geodetic_crs_from_datum` (pull #1390) 3.7.2