Merge pull request #157 from kiyo-masui/fixwheels

Fix the wheel build

.github/workflows/install_hdf5.sh

@@ -1,9 +1,13 @@
-HDF5_VERSION=$1
+HDF5_DISTRIBUTION=$1
+# Extract the patch number
+IFS='-' read -ra ADDR <<< "$HDF5_DISTRIBUTION"
 
-# Download and install HDF5 $HDF5_VERSION from source for building wheels
-curl https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${HDF5_VERSION%.*}/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.gz -O -s
-tar -xzf hdf5-$HDF5_VERSION.tar.gz
-cd hdf5-$HDF5_VERSION
+HDF5_VERSION=${ADDR[0]}
+
+# Download and install HDF5 $HDF5_DISTRIBUTION from source for building wheels
+curl https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${HDF5_VERSION%.*}/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_DISTRIBUTION.tar.gz -O -s
+tar -xzf hdf5-$HDF5_DISTRIBUTION.tar.gz
+cd hdf5-$HDF5_DISTRIBUTION
 ./configure --prefix=/usr/local
 make -j 2
 make install

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}

.github/workflows/wheels.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        hdf5: ["1.10.7", "1.14.4"]
+        hdf5: ["1.10.7", "1.14.4-3"]
 
     steps:
       # Checkout bitshuffle
@@ -45,7 +45,8 @@ jobs:
           #   .github/workflows/install_hdf5.sh 1.8.11
           # Run units tests but disable test_h5plugin.py
           CIBW_TEST_COMMAND: pytest {package}/tests
-          # The Github runners for macOS don't support AVX2 instructions and so the tests will fail with SIGILL, so skip them
+          # The Github runners for macOS don't support AVX2
+          # instructions and so the tests will fail with SIGILL, so skip them
           CIBW_TEST_SKIP: "*macosx*"
 
       # Package wheels and host on CI
@@ -57,14 +58,15 @@ jobs:
     name: Build source distribution
     strategy:
       matrix:
-        python-version: ["3.9"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - name: Install apt dependencies
         run: |
+          sudo apt-get update
           sudo apt-get install -y libhdf5-serial-dev hdf5-tools pkg-config
 
       - name: Install Python

pyproject.toml

@@ -1,9 +1,9 @@
 # Include dependencies when building wheels on cibuildwheel
 [build-system]
 requires = [
-    "setuptools>=0.7",
+    "setuptools",
     "Cython>=0.19",
-    "numpy>=1.6.1",
+    "numpy>=2.0.0rc1",
     "h5py>=2.4.0",
 ]
 

requirements.txt

@@ -1,5 +1,5 @@
 # Order matters
 setuptools>=0.7
 Cython>=0.19
-numpy>=1.6.1
+numpy>=1.24
 h5py>=2.4.0

setup.py

@@ -429,6 +429,7 @@ def build_extensions(self):
     cmdclass={"build_ext": build_ext, "install": install, "develop": develop},
     setup_requires=setup_requires,
     install_requires=requires,
+    python_requires=">=3.9",
     # extras_require={'H5':  ["h5py"]},
     package_data={"": ["data/*"]},
     # metadata for upload to PyPI