diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469..12647a5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051..dfef5ae 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -88,8 +88,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index a45c34f..c43b3db 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -59,8 +59,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step diff --git a/recipe/bad-numpy-patch.patch b/recipe/bad-numpy-patch.patch new file mode 100644 index 0000000..5649f6d --- /dev/null +++ b/recipe/bad-numpy-patch.patch @@ -0,0 +1,14 @@ +diff --git a/setup_build.py b/setup_build.py +index a041fa69..960bdccb 100644 +--- a/setup_build.py ++++ b/setup_build.py +@@ -129,7 +129,7 @@ class h5py_build_ext(build_ext): + from Cython.Build import cythonize + import numpy + +- complex256_support = hasattr(numpy, 'complex256') ++ complex256_support = False + + # This allows ccache to recognise the files when pip builds in a temp + # directory. It speeds up repeatedly running tests through tox with + diff --git a/recipe/build.sh b/recipe/build.sh index 1db0f7b..3651cd8 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +set -ex export HDF5_VERSION=${hdf5} if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then @@ -12,11 +12,6 @@ if [[ "$mpi" != "nompi" ]]; then export HDF5_MPI="ON" fi -if [[ ${target_platform} == "osx-arm64" ]]; then - # disable complex256 on macOS ARM64, see https://github.com/h5py/h5py/pull/2065 - export CIBW_ARCHS_MACOS=arm64 -fi - # tell setup.py to not 'pip install' exact package requirements export H5PY_SETUP_REQUIRES="0" diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 6f98d4c..4e0d5c9 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,4 @@ mpi: - nompi - mpich # [not win] - - openmpi # [not win] \ No newline at end of file + - openmpi # [not win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6fe5b14..40f002c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "3.11.0" %} -{% set build = 3 %} +{% set version = "3.12.1" %} +{% set build = 0 %} # mpi must be defined for conda-smithy lint {% set mpi = mpi or 'nompi' %} @@ -15,7 +15,11 @@ package: source: url: https://github.com/h5py/h5py/archive/{{ version }}.tar.gz - sha256: 034ec21f28f2f2edc4542515a9ae45356a25bb459048acf9622e6b1143b3fae7 + sha256: ee8d25e6cc6275779a2727258bcce9f2296a58b6e5ccf4cdc467a3c3a97b56b2 + patches: + # Disable complex256 for arm64 + # follow https://github.com/conda-forge/cross-python-feedstock/issues/92 + - bad-numpy-patch.patch # [osx and arm64] build: skip: true # [py<=37]