diff --git a/CHANGELOG.md b/CHANGELOG.md index 3954c2a..4a2d7b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## OpenBLAS v0.3.31.159 (v0.3.31-159-g7a95460b) + +### 0.3.31.159.0 (2026-03-17) +- Update to v0.3.31.159 + ## OpenBLAS v0.3.31.126 (v0.3.31-126-g55b16e59) ### 0.3.31.126.6 (2026-03-17) @@ -93,4 +98,4 @@ ## OpenBLAS v0.3.29.0 ### 0.3.29.0.0 (2025-04-03) -- Add build script for Windows on ARM64 +- Add build script for Windows on ARM64 \ No newline at end of file diff --git a/OpenBLAS b/OpenBLAS index 55b16e5..7a95460 160000 --- a/OpenBLAS +++ b/OpenBLAS @@ -1 +1 @@ -Subproject commit 55b16e5923d48cd3de42ff82c2c024a4a0c7e043 +Subproject commit 7a95460bb1fc7081a7861515705ed06a6223a5a2 diff --git a/ci-before-build.sh b/ci-before-build.sh index 3c6e1c0..83abf25 100755 --- a/ci-before-build.sh +++ b/ci-before-build.sh @@ -1,44 +1,5 @@ #! /bin/bash - -# Most of the content in this file comes from https://github.com/multi-build/multibuild, with some modifications -# Follow the license below - -# .. _license: - -# ********************* -# Copyright and License -# ********************* - -# The multibuild package, including all examples, code snippets and attached -# documentation is covered by the 2-clause BSD license. - -# Copyright (c) 2013-2024, Matt Terry and Matthew Brett; all rights -# reserved. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: - -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. - -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - set -xe if [[ "$NIGHTLY" = "true" ]]; then @@ -53,6 +14,13 @@ else export OPENBLAS_COMMIT=$(cat openblas_commit.txt) version=$(grep "^version =" pyproject.toml | sed 's/version = "//;s/"//') fi + +# Sanity check, strip off the last (build) number from version, convert - to . in OPENBLAS_COMMIT +if [[ "${OPENBLAS_COMMIT//-/.}" != *"${version%.*}"* ]]; then + echo "OPENBLAS_COMMIT $OPENBLAS_COMMIT does not match the pyproject.toml version $version" + exit -1 +fi + sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule echo "creating wheel from $OPENBLAS_COMMIT (NIGHTLY is $NIGHTLY)" @@ -61,17 +29,6 @@ if [ "$(uname)" != "Darwin" ]; then export PATH=/opt/clang/bin:$PATH fi -# Work round bug in travis xcode image described at -# https://github.com/direnv/direnv/issues/210 -shell_session_update() { :; } - -# Workaround for https://github.com/travis-ci/travis-ci/issues/8703 -# suggested by Thomas K at -# https://github.com/travis-ci/travis-ci/issues/8703#issuecomment-347881274 -unset -f cd -unset -f pushd -unset -f popd - # Build OpenBLAS source build-openblas.sh diff --git a/openblas_commit.txt b/openblas_commit.txt index c2ef62e..39ea368 100644 --- a/openblas_commit.txt +++ b/openblas_commit.txt @@ -1 +1 @@ -v0.3.31-126-g55b16e59 +v0.3.31-159-g7a95460b diff --git a/pyproject.toml b/pyproject.toml index f1f744a..7b58511 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,8 @@ build-backend = "setuptools.build_meta" [project] name = "scipy-openblas64" -# v0.3.31-126-g55b16e59 -version = "0.3.31.126.6" +# v0.3.31.159 +version = "0.3.31.159.0" requires-python = ">=3.7" description = "Provides OpenBLAS for python packaging" readme = "README.md"