WHL: Wheels contain PROJ 9.4.0 (#1386)

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PROJ_VERSION: "9.3.0"
+  PROJ_VERSION: "9.4.0"
   DEBIAN_FRONTEND: noninteractive
 
 jobs:

ci/proj-compile-wheels.sh

@@ -1,18 +1,18 @@
 # INSTALL PROJ & DEPENDENCIES FOR WHEELS
 # Test for macOS with [ -n "$IS_MACOS" ]
-SQLITE_VERSION=3420000
-LIBTIFF_VERSION=4.5.0
-CURL_VERSION=8.1.2
-NGHTTP2_VERSION=1.54.0
+SQLITE_VERSION=450100
+LIBTIFF_VERSION=4.6.0
+CURL_VERSION=8.6.0
+NGHTTP2_VERSION=1.60.0
 
 
 # ------------------------------------------
 # From: https://github.com/multi-build/multibuild/
 # ------------------------------------------
 BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"
-OPENSSL_ROOT=${OPENSSL_ROOT:-openssl-1.1.1l}
-# Hash from https://www.openssl.org/source/openssl-1.1.1?.tar.gz.sha256
-OPENSSL_HASH=${OPENSSL_HASH:-0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1}
+OPENSSL_ROOT=${OPENSSL_ROOT:-openssl-3.2.1}
+# Hash from https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256
+OPENSSL_HASH=${OPENSSL_HASH:-6ae015467dabf0469b139ada93319327be24b98251ffaeceda0221848dc09262}
 OPENSSL_DOWNLOAD_URL=${OPENSSL_DOWNLOAD_URL:-https://www.openssl.org/source}
 
 if [ $(uname) == "Darwin" ]; then
@@ -207,8 +207,23 @@ function build_zlib {
     touch zlib-stamp
 }
 
+function build_perl {
+    if [ -n "$IS_MACOS" ]; then return; fi  # OSX has perl already
+    if [ -e perl-stamp ]; then return; fi
+    if [[ $MB_ML_VER == "_2_24" ]]; then
+        # debian:9 based distro
+        apt-get install -y perl
+    else
+        # centos based distro
+        yum_install perl-core
+    fi
+    touch perl-stamp
+}
+
+
 function build_openssl {
     if [ -e openssl-stamp ]; then return; fi
+    suppress build_perl
     fetch_unpack ${OPENSSL_DOWNLOAD_URL}/${OPENSSL_ROOT}.tar.gz
     check_sha256sum $ARCHIVE_SDIR/${OPENSSL_ROOT}.tar.gz ${OPENSSL_HASH}
     (cd ${OPENSSL_ROOT} \
@@ -240,7 +255,7 @@ function build_curl_ssl {
         flags="$flags --with-darwinssl"
     else  # manylinux
         suppress build_openssl
-        flags="$flags --with-ssl"
+        flags="$flags --with-ssl --without-libpsl"
         LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BUILD_PREFIX/lib
     fi
     fetch_unpack https://curl.se/download/curl-${CURL_VERSION}.tar.gz
@@ -265,13 +280,13 @@ 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/2023
+    build_simple sqlite-autoconf $SQLITE_VERSION https://www.sqlite.org/2024
     touch sqlite-stamp
 }
 
 function build_proj {
     if [ -e proj-stamp ]; then return; fi
-    get_modern_cmake
+    suppress get_modern_cmake
     fetch_unpack https://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz
     suppress build_curl_ssl
     (cd proj-${PROJ_VERSION:0:5} \
@@ -290,7 +305,7 @@ function build_proj {
 }
 
 # Run installation process
-update_env_for_build_prefix
+suppress update_env_for_build_prefix
 suppress build_zlib
 suppress build_sqlite
 suppress build_libtiff

ci/vcpkg.json

@@ -1,11 +1,11 @@
 {
     "name": "pyproj",
-    "version": "3.6.0",
+    "version": "3.7.0",
     "dependencies": [
         {
             "name": "proj",
-            "version>=": "9.3.0"
+            "version>=": "9.4.0"
         }
     ],
-    "builtin-baseline": "7b5ca09708ae42dba9517d4e0a0c975d087f1061"
+    "builtin-baseline": "46542ddc124d692945b66cf6dda9876b9eef1dc3"
 }

docs/history.rst

@@ -3,6 +3,7 @@ Change Log
 
 Latest
 ------
+- WHL: Wheels contain PROJ 9.4.0 (pull #1386)
 - DEP: Minimum supported Python version 3.10 (pull #1357)
 - ENH: Add :meth:`CRS.is_deprecated` and :meth:`CRS.get_non_deprecated` (pull #1383)