diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 66640cf6..712d166e 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -11,6 +11,11 @@ on: schedule: - cron: '0 0 * * 0' workflow_call: + inputs: + publish: + type: boolean + default: false + required: false jobs: @@ -53,7 +58,7 @@ jobs: - { os: ubuntu-24.04-arm, PLAT: riscv64, INTERFACE64: '1', MB_ML_VER: '_2_39', MB_ML_LIBC: manylinux} env: - NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} + NIGHTLY: ${{ inputs.publish == false && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }} MB_ML_LIBC: ${{ matrix.MB_ML_LIBC }} MB_ML_VER: ${{ matrix.MB_ML_VER }} INTERFACE64: ${{ matrix.INTERFACE64 }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b8b51ac0..a81aa180 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,6 +19,8 @@ jobs: # Workflows to build wheels call-posix: uses: ./.github/workflows/posix.yml + with: + publish: true call-windows: @@ -133,4 +135,4 @@ jobs: # uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0 # with: # print-hash: true -# attestations: true \ No newline at end of file +# attestations: true diff --git a/ci-before-build.sh b/ci-before-build.sh index 1288d9da..519ce524 100755 --- a/ci-before-build.sh +++ b/ci-before-build.sh @@ -45,13 +45,14 @@ if [[ "$NIGHTLY" = "true" ]]; then pushd OpenBLAS git checkout develop export OPENBLAS_COMMIT=$(git describe --tags --abbrev=8) - # Set the pyproject.toml version: convert v0.3.24-30-g138ed79f to 0.3.34.30 - version=$(echo $OPENBLAS_COMMIT | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g") + # Set the pyproject.toml version: convert v0.3.24-30-g138ed79f to 0.3.34.30.0 + version=$(echo $OPENBLAS_COMMIT | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g").0 popd sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml else export OPENBLAS_COMMIT=$(cat openblas_commit.txt) fi +echo "creating wheel from $OPENBLAS_COMMIT (NIGHTLY is $NIGHTLY)" if [ "$(uname)" != "Darwin" ]; then ./tools/install-static-clang.sh diff --git a/pyproject.toml b/pyproject.toml index 46869560..dc03212b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta" [project] name = "scipy-openblas64" # v0.3.31-126-g55b16e59 -version = "0.3.31.126.2" +version = "0.3.31.126.3" requires-python = ">=3.7" description = "Provides OpenBLAS for python packaging" readme = "README.md"