Skip to content

Commit 41e9651

Browse files
committed
bump OpenBLAS version to 0.3.29, drop musl=1.1, cleanups
1 parent 19372c1 commit 41e9651

File tree

4 files changed

+13
-63
lines changed

4 files changed

+13
-63
lines changed

.github/workflows/posix.yml

+2-24
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
REPO_DIR: OpenBLAS
14-
OPENBLAS_COMMIT: "v0.3.28"
14+
OPENBLAS_COMMIT: "v0.3.29"
1515
MACOSX_DEPLOYMENT_TARGET: 10.9
1616

1717
jobs:
@@ -35,16 +35,6 @@ jobs:
3535
- os: macos-13
3636
PLAT: arm64
3737
INTERFACE64: '0'
38-
- os: ubuntu-latest
39-
PLAT: x86_64
40-
INTERFACE64: '1'
41-
MB_ML_LIBC: musllinux
42-
MB_ML_VER: _1_1
43-
- os: ubuntu-latest
44-
PLAT: x86_64
45-
INTERFACE64: '0'
46-
MB_ML_LIBC: musllinux
47-
MB_ML_VER: _1_1
4838
- os: ubuntu-latest
4939
PLAT: x86_64
5040
INTERFACE64: '1'
@@ -56,7 +46,6 @@ jobs:
5646
MB_ML_LIBC: musllinux
5747
MB_ML_VER: _1_2
5848

59-
6049
- os: ubuntu-24.04-arm
6150
PLAT: aarch64
6251
INTERFACE64: '0'
@@ -65,16 +54,6 @@ jobs:
6554
PLAT: aarch64
6655
INTERFACE64: '1'
6756
MB_ML_VER: '2014'
68-
- os: ubuntu-24.04-arm
69-
PLAT: aarch64
70-
INTERFACE64: '0'
71-
MB_ML_LIBC: musllinux
72-
MB_ML_VER: _1_1
73-
- os: ubuntu-24.04-arm
74-
PLAT: aarch64
75-
INTERFACE64: '1'
76-
MB_ML_LIBC: musllinux
77-
MB_ML_VER: _1_1
7857
- os: ubuntu-24.04-arm
7958
PLAT: aarch64
8059
INTERFACE64: '0'
@@ -194,7 +173,6 @@ jobs:
194173
env:
195174
ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
196175
run: |
197-
# Pin urllib3<2 due to github.com/Anaconda-Platform/anaconda-client/issues/654
198-
conda install -y anaconda-client 'urllib3<2.0.0'
176+
conda install -y anaconda-client
199177
source tools/upload_to_anaconda_staging.sh
200178
upload_wheels

.github/workflows/windows.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch: null
99

1010
env:
11-
OPENBLAS_COMMIT: "v0.3.28"
11+
OPENBLAS_COMMIT: "v0.3.29"
1212
OPENBLAS_ROOT: "c:\\opt"
1313
# Preserve working directory for calls into bash
1414
# Without this, invoking bash will cd to the home directory
@@ -161,9 +161,12 @@ jobs:
161161
python -m scipy_openblas32
162162
python -c "import scipy_openblas32; print(scipy_openblas32.get_pkg_config())"
163163
164-
- uses: conda-incubator/setup-miniconda@v3.0.1
164+
- uses: conda-incubator/setup-miniconda@v3.1.1
165165
with:
166+
channels: conda-forge
167+
channel-priority: true
166168
activate-environment: upload
169+
miniforge-version: latest
167170

168171
- name: Upload
169172
# see https://github.com/marketplace/actions/setup-miniconda for why
@@ -172,7 +175,6 @@ jobs:
172175
env:
173176
ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
174177
run: |
175-
# Pin urllib3<2 due to github.com/Anaconda-Platform/anaconda-client/issues/654
176-
conda install -y anaconda-client 'urllib3<2.0.0'
178+
conda install -y anaconda-client
177179
source tools/upload_to_anaconda_staging.sh
178180
upload_wheels

.travis.yml

+2-32
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ env:
22
global:
33
# The archive that gets built has name from ``git describe`` on this
44
# commit.
5-
- OPENBLAS_COMMIT: "v0.3.28"
5+
- OPENBLAS_COMMIT: "v0.3.29"
66
- REPO_DIR=OpenBLAS
77

88
sudo: required
@@ -11,36 +11,6 @@ services: docker
1111

1212
matrix:
1313
include:
14-
- os: linux
15-
arch: arm64
16-
env:
17-
- PLAT=aarch64
18-
- MB_ML_VER=_1_1
19-
- INTERFACE64=0
20-
- MB_ML_LIBC=musllinux
21-
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
22-
- os: linux
23-
arch: arm64
24-
env:
25-
- PLAT=aarch64
26-
- INTERFACE64=1
27-
- MB_ML_VER=_1_1
28-
- MB_ML_LIBC=musllinux
29-
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
30-
- os: linux
31-
arch: arm64
32-
env:
33-
- PLAT=aarch64
34-
- MB_ML_VER=2014
35-
- INTERFACE64=0
36-
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
37-
- os: linux
38-
arch: arm64
39-
env:
40-
- PLAT=aarch64
41-
- INTERFACE64=1
42-
- MB_ML_VER=2014
43-
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
4414
- os: linux
4515
arch: s390x
4616
env:
@@ -93,7 +63,7 @@ script:
9363
after_success:
9464
- set +ex
9565
- sudo chmod -R a+w /home/travis/.cache
96-
- pip install -q git+https://github.com/Anaconda-Platform/anaconda-client@1.8.0
66+
- pip install -q git+https://github.com/Anaconda-Platform/anaconda-client@1.13.0
9767
# Upload libraries to the shared staging area on anaconda.org
9868
- sudo chmod -R a+w dist
9969
- source tools/upload_to_anaconda_staging.sh

pyproject.toml

+3-3
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.28
12-
version = "0.3.28.0.2"
11+
# v0.3.29
12+
version = "0.3.29.0.0"
1313
requires-python = ">=3.7"
1414
description = "Provides OpenBLAS for python packaging"
1515
readme = "README.md"
@@ -26,7 +26,7 @@ license = {file = "LICENSE.txt"}
2626

2727
[project.urls]
2828
homepage = "https://github.com/MacPython/openblas-libs"
29-
upstream = "https://github.com/xianyi/OpenBLAS"
29+
upstream = "https://github.com/OpenMathLib/OpenBLAS"
3030

3131
[tool.setuptools.packages.find]
3232
# scanning for namespace packages is true by default in pyproject.toml, so

0 commit comments

Comments
 (0)