Skip to content

Commit 270c32e

Browse files
authored
Merge pull request #270 from mattip/v0.3.33
OpenBLAS 0.3.33 was released
2 parents 2ddc8c9 + c53ca3a commit 270c32e

8 files changed

Lines changed: 29 additions & 28 deletions

File tree

.github/workflows/posix.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,19 @@ jobs:
7070
submodules: recursive
7171
fetch-depth: 0
7272

73-
- uses: maxim-lobanov/setup-xcode@v1.6.0
73+
- uses: maxim-lobanov/setup-xcode@v1.7.0
7474
if: ${{ matrix.os == 'macos-latest' }}
7575
with:
7676
xcode-version: '16.0'
7777

78-
- uses: maxim-lobanov/setup-xcode@v1.6.0
78+
- uses: maxim-lobanov/setup-xcode@v1.7.0
7979
if: ${{ matrix.os == 'macos-14' }}
8080
with:
8181
xcode-version: '15.4'
8282

8383
- name: Set up QEMU
8484
if: matrix.PLAT == 'ppc64le' || matrix.PLAT == 's390x' || matrix.PLAT == 'riscv64'
85-
uses: docker/setup-qemu-action@v3.7.0
85+
uses: docker/setup-qemu-action@v4.0.0
8686
with:
8787
platforms: all
8888

@@ -123,22 +123,9 @@ jobs:
123123
name: wheels-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}-${{ matrix.MB_ML_VER }}
124124
path: dist/scipy_openblas*.whl
125125

126-
127-
- uses: conda-incubator/setup-miniconda@v3.3.0
126+
- name: Upload to ananconda.org
127+
if: ${{ inputs.publish == false && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }}
128+
uses: scientific-python/upload-nightly-action@0.6.4
128129
with:
129-
channels: conda-forge
130-
channel-priority: true
131-
activate-environment: upload
132-
miniforge-version: latest
133-
conda-remove-defaults: "true"
134-
135-
- name: Upload
136-
# see https://github.com/marketplace/actions/setup-miniconda for why
137-
# `-el {0}` is required.
138-
shell: bash -el {0}
139-
env:
140-
ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
141-
run: |
142-
conda install -y anaconda-client
143-
source tools/upload_to_anaconda_staging.sh
144-
upload_wheels
130+
artifacts_path: dist
131+
anaconda_nightly_upload_token: ${{secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD}}

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
python -m pip install pkgconf
171171
python -m pkgconf scipy-openblas --cflags
172172
173-
- uses: conda-incubator/setup-miniconda@v3.1.1
173+
- uses: conda-incubator/setup-miniconda@v4.0.1
174174
with:
175175
channels: conda-forge
176176
channel-priority: true

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## OpenBLAS v0.3.33
2+
3+
### 0.3.33.0.0 (2026-05-03)
4+
- Update to OpenBLAS 0.3.33
5+
16
## OpenBLAS v0.3.31.188 (v0.3.31-188-g4956446c)
27

38
### 0.3.31.188.1 (2026-03-23)

build-openblas.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ before_build
77

88
echo "------ CLEAN CODE --------"
99
clean_code $OPENBLAS_COMMIT
10+
sed -e "s/^VERSION = .*/VERSION = ${OPENBLAS_VERSION}/" -i.bak OpenBLAS/Makefile.rule
1011
echo "------ BUILD LIB --------"
1112
build_lib "$PLAT" "$INTERFACE64"

ci-before-build.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,18 @@ else
1515
version=$(grep "^version =" pyproject.toml | sed 's/version = "//;s/"//')
1616
fi
1717

18-
# Sanity check, strip off the last (build) number from version, convert - to . in OPENBLAS_COMMIT
19-
if [[ "${OPENBLAS_COMMIT//-/.}" != *"${version%.*}"* ]]; then
18+
obcommit=$OPENBLAS_COMMIT
19+
# add .0 if OPENBLAS_COMMIT is an actual tag
20+
[[ "$obcommit" == *-* ]] || obcommit="$obcommit.0"
21+
22+
# convert - to . in OPENBLAS_COMMIT
23+
# strip off the last (build) number from version
24+
if [[ "${obcommit//-/.}" != *"${version%.*}"* ]]; then
2025
echo "OPENBLAS_COMMIT $OPENBLAS_COMMIT does not match the pyproject.toml version $version"
2126
exit -1
2227
fi
2328

24-
sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule
29+
export OPENBLAS_VERSION=$version
2530
echo "creating wheel from $OPENBLAS_COMMIT (NIGHTLY is $NIGHTLY)"
2631

2732
case "$PLAT" in

openblas_commit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.3.31-188-g4956446c
1+
v0.3.33

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ build-backend = "setuptools.build_meta"
88

99
[project]
1010
name = "scipy-openblas64"
11-
# v0.3.31-188-g4956446c
12-
version = "0.3.31.188.1"
11+
# v0.3.33
12+
version = "0.3.33.0.0"
1313
requires-python = ">=3.7"
1414
description = "Provides OpenBLAS for python packaging"
1515
readme = "README.md"

tools/build_prepare_wheel.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ tar -C local/scipy_openblas64 --strip-components=2 -xf libs/openblas.tar.gz
1818
find local/scipy_openblas64/lib -maxdepth 1 -type l -delete
1919
rm local/scipy_openblas64/lib/*.a
2020
# Check that the pyproject.toml and the pkgconfig versions agree.
21+
echo "============ scipy-openblas.pc ======================="
22+
cat ./local/scipy_openblas64/lib/pkgconfig/scipy-openblas*.pc
23+
echo "============ scipy-openblas.pc ======================="
2124
py_version=$(grep "^version" pyproject.toml | sed -e "s/version = \"//")
2225
pkg_version=$(grep "version=" ./local/scipy_openblas64/lib/pkgconfig/scipy-openblas*.pc | sed -e "s/version=//" | sed -e "s/dev//")
2326
if [[ -z "$pkg_version" ]]; then

0 commit comments

Comments
 (0)