Replace the VERSION = in Makefile.rule with the one from pyproject.toml

Author: mattip

.github/workflows/publish.yml

@@ -4,7 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       environment:
-        description: Which PyPI environment to upload to, if any
+        description: |
+          Which PyPI environment to upload to?
+          Be sure to push an annotated tag to 'main' before choosing 'pypi'
         required: true
         type: choice
         options: [ "none", "testpypi", "pypi" ]

README.md

@@ -34,12 +34,14 @@ https://anaconda.org/scientific=python-nightly-wheels/scipy_openblas64 via
 There are workflow triggers for repo admins. They can trigger a testpypi build
 or a pypi build with the publish workflow, which will upload the wheels using
 trusted publishing. In order to publish to PyPI, there must be a tag at the HEAD
-of the branch used to publish. Use annotated tags:
+of the branch used to publish. After merging a PR, be sure to update to main and
+use annotated tags:
 ```
+git checkout main; git pull
 git tag -a v0.3.31.126.4 -m"fixed something"
 ```
 The wheel is self-contained, it includes all needed gfortran support libraries.
-On windows, this is a single DLL. 
+On windows, this is a single DLL.
 
 ## Buildtime
 

ci-before-build.sh

@@ -51,7 +51,9 @@ if [[ "$NIGHTLY" = "true" ]]; then
     sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
 else
     export OPENBLAS_COMMIT=$(cat openblas_commit.txt)
+    version=$(grep "^version =" pyproject.toml | sed 's/version = "//;s/"//')
 fi
+sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule
 echo "creating wheel from $OPENBLAS_COMMIT (NIGHTLY is $NIGHTLY)"
 
 if [ "$(uname)" != "Darwin" ]; then

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.5"
+version = "0.3.31.126.6"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

tools/build_steps_win_arm64.bat

@@ -1,16 +1,16 @@
-:: Build script for scipy_openblas wheel on Windows on ARM64
-
-:: Usage: build_steps_win_arm64.bat [build_bits] [if_bits]
-:: e.g build_steps_win_arm64.bat 64 64
-
-:: build_bits  (default binary architecture, 32 or 64, unspec -> 64).
-:: if_bits (default interface size, 32 or 64, unspec -> 32)
-:: If INTERFACE64 environment variable is 1, then if_bits defaults to 64
-:: Expects these binaries on the PATH:
-::   clang-cl, flang-new, cmake, perl
-:: First commit containing WoA build fixes.
-:: Minimum OpenBLAS commit to build; we'll update to this if commit not
-:: present.
+REM Build script for scipy_openblas wheel on Windows on ARM64
+
+REM Usage: build_steps_win_arm64.bat [build_bits] [if_bits]
+REM e.g build_steps_win_arm64.bat 64 64
+
+REM build_bits  (default binary architecture, 32 or 64, unspec -> 64).
+REM if_bits (default interface size, 32 or 64, unspec -> 32)
+REM If INTERFACE64 environment variable is 1, then if_bits defaults to 64
+REM Expects these binaries on the PATH:
+REM   clang-cl, flang-new, cmake, perl
+REM First commit containing WoA build fixes.
+REM Minimum OpenBLAS commit to build; we'll update to this if commit not
+REM present.
 set first_woa_buildable_commit="de2380e5a6149706a633322a16a0f66faa5591fc"
 
 @echo off
@@ -33,7 +33,7 @@ if "%2"=="" (
 )
 echo Building for %build_bits%-bit binary, %if_bits%-bit interface...
 
-:: Define destination directory
+REM Define destination directory
 pushd "%~dp0\.."
 set "ob_out_root=%CD%\local\scipy_openblas"
 set "ob_64=%ob_out_root%64"
@@ -54,13 +54,13 @@ if "%if_bits%"=="64" (
     )
 )
 
-:: Clone OpenBLAS
+REM Clone OpenBLAS
 echo Cloning OpenBLAS repository with submodules...
 git submodule update --init --recursive OpenBLAS
 if errorlevel 1 exit /b 1
 set /p OPENBLAS_COMMIT=<openblas_commit.txt
 
-:: Enter OpenBLAS directory and checkout buildable commit
+REM Enter OpenBLAS directory and checkout buildable commit
 cd OpenBLAS
 git checkout %OPENBLAS_COMMIT%
 git merge-base --is-ancestor %first_woa_buildable_commit% HEAD 2>NUL
@@ -70,30 +70,38 @@ if errorlevel 1 (
     exit /b 2
 )
 
-:: Patch
+REM Patch
 for /r %%f in (..\patches\*) do git apply %%f
 if errorlevel 1 exit /b 1
 
-:: Set suffixed-ILP64 flags
+REM Patch VERSION
+REM version=$(grep "^version =" pyproject.toml | sed 's/version = "//;s/"//')
+REM sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule
+
+for /f "tokens=3 delims= " %%v in ('findstr /b "version = " pyproject.toml') do set version=%%v
+set version=%version:"=%
+powershell -Command "(Get-Content OpenBLAS/Makefile.rule) -replace '^VERSION = .*', 'VERSION = %version%' | Set-Content OpenBLAS/Makefile.rule"
+
+REM Set suffixed-ILP64 flags
 if "%if_bits%"=="64" (
     set "interface_flags=-DINTERFACE64=1 -DSYMBOLSUFFIX=64_"
 ) else (
     set "interface_flags="
 )
 
-:: Create build directory and navigate to it
+REM Create build directory and navigate to it
 if exist build (rmdir /S /Q build || exit /b 1)
 mkdir build || exit /b 1 & cd build || exit /b 1
 
 echo Setting up ARM64 Developer Command Prompt and running CMake...
 
-:: Initialize VS ARM64 environment
+REM Initialize VS ARM64 environment
 CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"
 
-:: Prefer LLVM flang
+REM Prefer LLVM flang
 PATH=C:\Program Files\LLVM\bin;%PATH%
 
-:: Run CMake and Ninja build
+REM Run CMake and Ninja build
 
 set CFLAGS=-Wno-reserved-macro-identifier -Wno-unsafe-buffer-usage -Wno-unused-macros -Wno-sign-conversion -Wno-reserved-identifier
 cmake .. -G Ninja ^
@@ -132,13 +140,13 @@ if "%if_bits%"=="32" (
     cd ..
 )
 
-:: Prepare destination directory
+REM Prepare destination directory
 cd OpenBLAS/build
 echo Preparing destination directory at %DEST_DIR%
 if not exist "%DEST_DIR%\lib\cmake\OpenBLAS" mkdir "%DEST_DIR%\lib\cmake\OpenBLAS"
 if not exist "%DEST_DIR%\include" mkdir "%DEST_DIR%\include"
 
-:: Move library files
+REM Move library files
 echo Moving library files...
 if exist lib\release (
     move /Y lib\release\*.dll "%DEST_DIR%\lib\"
@@ -154,19 +162,19 @@ if exist lib\release (
     exit /b 1
 )
 
-:: Copy CMake configuration files
+REM Copy CMake configuration files
 echo Copying CMake configuration files...
 if exist openblasconfig.cmake copy /Y openblasconfig.cmake "%DEST_DIR%\lib\cmake\openblas\"
 if exist openblasconfigversion.cmake copy /Y openblasconfigversion.cmake "%DEST_DIR%\lib\cmake\openblas\"
 
-:: Copy header files
+REM Copy header files
 echo Copying generated header files...
 if exist generated xcopy /E /Y generated "%DEST_DIR%\include\"
 if exist lapacke_mangling.h copy /Y lapacke_mangling.h "%DEST_DIR%\include\"
 if exist openblas_config.h copy /Y openblas_config.h "%DEST_DIR%\include\"
 
 
-:: Copy LAPACKE header files
+REM Copy LAPACKE header files
 echo Copying LAPACKE header files...
 xcopy /Y "..\lapack-netlib\lapacke\include\*.h" "%DEST_DIR%\include\"
 if errorlevel 1 exit /b 1
@@ -189,14 +197,14 @@ if errorlevel 1 (
     exit /b 1
 )
 
-:: Move back to the root directory
+REM Move back to the root directory
 cd ..
 if errorlevel 1 (
     echo Current directory %CD%, cannot cd ..
     exit /b 1
 )
 
-:: Build the Wheel & Install It
+REM Build the Wheel & Install It
 echo Running 'python -m build' to build the wheel in %CD%
 python -c "import build" 2>NUL || pip install build
 if "%if_bits%"=="64" (
@@ -213,15 +221,15 @@ if "%if_bits%"=="32" (
     move /Y "%CD%\ob64_backup" "%ob_64%"
 )
 
-:: Rename the wheel
+REM Rename the wheel
 for %%f in (dist\*any.whl) do (
     set WHEEL_FILE=dist\%%f
     set "filename=%%~nxf"
     set "newname=!filename:any.whl=win_arm64.whl!"
     ren "dist\!filename!" "!newname!"
 )
 
-:: Locate the built wheel
+REM Locate the built wheel
 for /f %%f in ('dir /b dist\scipy_openblas*.whl 2^>nul') do set WHEEL_FILE=dist\%%f
 
 if not defined WHEEL_FILE (

tools/build_steps_windows.sh

@@ -94,6 +94,10 @@ OPENBLAS_VERSION=$(git describe --tags --abbrev=8)
 # with libquadmath
 patch -p1 < ../patches-windows/openblas-make-libs.patch
 
+# Patch VERSION
+version=$(grep "^version =" pyproject.toml | sed 's/version = "//;s/"//')
+sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule
+
 # Build OpenBLAS
 CFLAGS="$CFLAGS -fvisibility=protected -fno-ident" \
 make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \

tools/local_build.sh

@@ -20,7 +20,9 @@ else
     echo got nothing
     exit -1
 fi
-export OPENBLAS_COMMIT="v0.3.30-349-gf6df9beb"
+export OPENBLAS_COMMIT=$(cat openblas_commit.txt)
+version=$(echo $OPENBLAS_COMMIT | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g").0
+sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule
 
 # export MB_ML_LIBC=musllinux
 # export MB_ML_VER=_1_2