Skip to content

Commit f4a84ac

Browse files
committed
typos, add a basic test
1 parent c211e21 commit f4a84ac

3 files changed

Lines changed: 18 additions & 11 deletions

File tree

ci-test.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,21 @@ if [ "$(uname)" == "Darwin" -a "${PLAT}" == "x86_64" ]; then
1212
which python3.9
1313
PYTHON="arch -x86_64 python3.9"
1414
fi
15+
16+
# Make sure the module works and that the version strings match
17+
# cibuildwheel will install the wheel automatically
1518
if [ "${INTERFACE64}" != "1" ]; then
16-
# cibuildwheel will install the wheel automatically
17-
# $PYTHON -m pip install --no-index --find-links /tmp/cibuildwheel/repaired_wheel scipy_openblas32
18-
$PYTHON -m scipy_openblas32
19+
config_str=$($PYTHON -m scipy_openblas32)
1920
else
20-
# $PYTHON -m pip install --no-index --find-links /tmp/cibuildwheel/repaired_wheel scipy_openblas64
21-
$PYTHON -m scipy_openblas64
21+
config_str=$($PYTHON -m scipy_openblas64)
22+
fi
23+
version=$($PYTHON -m pip list | grep scipy-openblas | sed 's/.*\s//')
24+
if [[ "$config_str" != *"$version"* ]]; then
25+
echo "config_str version does not match the pyproject.toml"
26+
exit -1
2227
fi
2328

29+
30+
2431
$PYTHON -m pip install pkgconf
2532
$PYTHON -m pkgconf scipy-openblas --cflags

tools/build_steps_win_arm64.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ for /r %%f in (..\patches\*) do git apply %%f
7575
if errorlevel 1 exit /b 1
7676

7777
REM Patch VERSION
78-
REM version=$(grep "^version =" pyproject.toml | sed 's/version = "//;s/"//')
79-
REM sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule
78+
REM version=$(grep "^version =" ../pyproject.toml | sed 's/version = "//;s/"//')
79+
REM sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak Makefile.rule
8080

81-
for /f "tokens=3 delims= " %%v in ('findstr /b "version = " pyproject.toml') do set version=%%v
81+
for /f "tokens=3 delims= " %%v in ('findstr /b "version = " ..\pyproject.toml') do set version=%%v
8282
set version=%version:"=%
83-
powershell -Command "(Get-Content OpenBLAS/Makefile.rule) -replace '^VERSION = .*', 'VERSION = %version%' | Set-Content OpenBLAS/Makefile.rule"
83+
powershell -Command "(Get-Content OpenBLAS/Makefile.rule) -replace '^VERSION = .*', 'VERSION = %version%' | Set-Content Makefile.rule"
8484

8585
REM Set suffixed-ILP64 flags
8686
if "%if_bits%"=="64" (

tools/build_steps_windows.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ OPENBLAS_VERSION=$(git describe --tags --abbrev=8)
9595
patch -p1 < ../patches-windows/openblas-make-libs.patch
9696

9797
# Patch VERSION
98-
version=$(grep "^version =" pyproject.toml | sed 's/version = "//;s/"//')
99-
sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule
98+
version=$(grep "^version =" ../pyproject.toml | sed 's/version = "//;s/"//')
99+
sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak Makefile.rule
100100

101101
# Build OpenBLAS
102102
CFLAGS="$CFLAGS -fvisibility=protected -fno-ident" \

0 commit comments

Comments
 (0)