From e1673ace311e8694d0d72491b48085576f8adfa8 Mon Sep 17 00:00:00 2001
From: Mike Gevaert <mgevaert@openbraininstitute.org>
Date: Wed, 15 Oct 2025 16:18:44 +0200
Subject: [PATCH] update to HDF5 1.14.6 to match newly released h5py

---
 .github/workflows/publish-sdist-wheels.yml |  7 ++-----
 ci/hdf5-build.sh                           | 16 ++++++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish-sdist-wheels.yml b/.github/workflows/publish-sdist-wheels.yml
index e6429b5..f30be64 100644
--- a/.github/workflows/publish-sdist-wheels.yml
+++ b/.github/workflows/publish-sdist-wheels.yml
@@ -6,9 +6,8 @@ env:
 
   CIBW_BUILD_VERBOSITY: 3
   CIBW_BUILD: 'cp*'
-  CIBW_SKIP: 'cp35-* cp36-* cp37-* cp38-* *-musllinux_* *-manylinux_i686'
+  CIBW_SKIP: 'cp39-* *-musllinux_* *-manylinux_i686 "cp314t-*"'
   CIBW_TEST_COMMAND: ( cd {project}/python/tests; python -m unittest -v )
-  UNIXY_HDF5_VERSION: 1.14.3
 
 jobs:
   build_wheels:
@@ -19,8 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-22.04, macos-13, macos-14]
+        os: [ubuntu-22.04, macos-14, macos-15-intel]
 
     steps:
       - uses: actions/checkout@v4
@@ -62,7 +60,6 @@ jobs:
           export STATIC_HDF5=True
           export CMAKE_PREFIX_PATH=/opt/hdf5-static/install-x86_64/install/
 
-          CIBW_MANYLINUX_X86_64_IMAGE=manylinux2014 python -m cibuildwheel --output-dir dist
           CIBW_MANYLINUX_X86_64_IMAGE=manylinux_2_28 python -m cibuildwheel --output-dir dist
 
       - name: Build wheels Mac OS
diff --git a/ci/hdf5-build.sh b/ci/hdf5-build.sh
index 7a3bd86..a8b1d54 100755
--- a/ci/hdf5-build.sh
+++ b/ci/hdf5-build.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e -x
 
-: "${UNIXY_HDF5_VERSION:=1.14.3}"
 : "${CIBW_ARCHS_MACOS:=$(uname -m)}"
 
 export INPUT=$(cd $(dirname "$1") && pwd -P)/$(basename "$1")
@@ -10,12 +9,13 @@ export OUTPUT="$INPUT/install-$CIBW_ARCHS_MACOS"
 
 function download_unpack_hdf5 {
     pushd "$INPUT"
-    local name=CMake-hdf5-$UNIXY_HDF5_VERSION.tar.gz
+    local name=hdf5_1.14.6.tar.gz
     if [[ ! -e $name ]]; then
-        echo "Downloading & unpacking HDF5 ${UNIXY_HDF5_VERSION}"
-        curl -fsSLO "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${UNIXY_HDF5_VERSION%.*}/hdf5-$UNIXY_HDF5_VERSION/src/$name"
+        echo "Downloading & unpacking HDF5 ${name}"
+        curl -fsSLO "https://github.com/HDFGroup/hdf5/archive/refs/tags/${name}"
     fi
-    tar xzf "$name"
+    mkdir -p "${INPUT}/hdf5"
+    tar xzf "$name" -C "${INPUT}/hdf5"  --strip-components=1
     popd
 }
 
@@ -44,15 +44,19 @@ else
     cmake -B "$OUTPUT/build" -G'Unix Makefiles' \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DBUILD_SHARED_LIBS=OFF \
+        -DHDF5_ENABLE_NONSTANDARD_FEATURES=OFF \
+        -DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF \
+        -DHDF5_BUILD_STATIC_TOOLS=OFF \
         -DHDF5_BUILD_UTILS=OFF \
         -DHDF5_BUILD_HL_LIB=OFF \
         -DHDF5_BUILD_EXAMPLES=OFF \
         -DBUILD_TESTING=OFF \
         -DHDF5_BUILD_TOOLS=OFF \
         -DHDF5_ENABLE_SZIP_ENCODING=OFF \
+        -DHDF5_ENABLE_SZIP_SUPPORT=OFF \
         -DHDF5_ENABLE_Z_LIB_SUPPORT=OFF \
         -DCMAKE_INSTALL_PREFIX="$INSTALL" \
-        -S "$INPUT/CMake-hdf5-$UNIXY_HDF5_VERSION/hdf5-$UNIXY_HDF5_VERSION"
+        -S "$INPUT/hdf5"
 
     cmake --build "$OUTPUT/build" -j "$NPROC"
     cmake --install "$OUTPUT/build"