diff --git a/OpenBLAS b/OpenBLAS index 5ffbf38..55b16e5 160000 --- a/OpenBLAS +++ b/OpenBLAS @@ -1 +1 @@ -Subproject commit 5ffbf38b41a1fe494d038efcb09cf22f4d527c22 +Subproject commit 55b16e5923d48cd3de42ff82c2c024a4a0c7e043 diff --git a/ci-repair-wheel.sh b/ci-repair-wheel.sh index 22fb2ba..8eeee73 100755 --- a/ci-repair-wheel.sh +++ b/ci-repair-wheel.sh @@ -21,14 +21,22 @@ else # Add an RPATH to libgfortran: # https://github.com/pypa/auditwheel/issues/451 - if [ "$MB_ML_LIBC" == "musllinux" ]; then - apk add zip - else - yum install -y zip - fi - unzip $1/*.whl "*libgfortran*" + # Use zipfile since the manylinux images do not have `zip` + python3 -c " +import re, sys, zipfile, pathlib +whl = next(pathlib.Path(sys.argv[1]).glob('*.whl')) +with zipfile.ZipFile(whl, 'a') as z: + members = [m for m in z.namelist() if re.search(r'libgfortran', m)] + z.extractall(members=members) + " "$1" patchelf --force-rpath --set-rpath '$ORIGIN' */lib/libgfortran* - zip $1/*.whl */lib/libgfortran* + python3 -c " +import sys, zipfile, pathlib, glob +whl = next(pathlib.Path(sys.argv[1]).glob('*.whl')) +with zipfile.ZipFile(whl, 'a') as z: + for f in glob.glob('*/lib/libgfortran*'): + z.write(f) + " "$1" mkdir -p /output # copy libs/openblas*.tar.gz to dist/ cp libs/openblas*.tar.gz /output/ diff --git a/openblas_commit.txt b/openblas_commit.txt index 03c7814..c2ef62e 100644 --- a/openblas_commit.txt +++ b/openblas_commit.txt @@ -1 +1 @@ -v0.3.31-22-g5ffbf38b +v0.3.31-126-g55b16e59 diff --git a/pyproject.toml b/pyproject.toml index 348a512..c5bad07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,8 @@ build-backend = "setuptools.build_meta" [project] name = "scipy-openblas64" -# v0.3.31-22-g5ffbf38b -version = "0.3.31.22.1" +# v0.3.31-126-g55b16e59 +version = "0.3.31.126.0" requires-python = ">=3.7" description = "Provides OpenBLAS for python packaging" readme = "README.md"