Skip to content

Commit

Permalink
Merge pull request #146 from regro-cf-autotick-bot/3.12.1_hf4db5d
Browse files Browse the repository at this point in the history
h5py v3.12.1
  • Loading branch information
tacaswell authored Oct 16, 2024
2 parents b298870 + d906f30 commit 0bab313
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions recipe/bad-numpy-patch.patch
Original file line number Diff line number Diff line change
@@ -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

7 changes: 1 addition & 6 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
set -ex

export HDF5_VERSION=${hdf5}
if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
Expand All @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mpi:
- nompi
- mpich # [not win]
- openmpi # [not win]
- openmpi # [not win]
10 changes: 7 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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' %}
Expand All @@ -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]
Expand Down

0 comments on commit 0bab313

Please sign in to comment.