8000 disable pypy builds, move PKG_CONFIG_PATH for windows · numpy/numpy@ffcd334 · GitHub
[go: up one dir, main page]
Skip to content

Commit ffcd334

Browse files
mattipmattip
committed
disable pypy builds, move PKG_CONFIG_PATH for windows
1 parent 9999c3f commit ffcd334

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

‎.github/workflows/wheels.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ jobs:
7979
- [macos-12, macosx_x86_64]
8080
- [windows-2019, win_amd64]
8181
- [windows-2019, win32]
82-
python: ["cp39", "cp310", "cp311", "pp39"]
82+
python: ["cp39", "cp310", "cp311"]
83+
# python: ["cp39", "cp310", "cp311", "pp39"]
8384
exclude:
8485
# Don't build PyPy 32-bit windows
8586
- buildplat: [windows-2019, win32]

‎pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ test-skip = "*_universal2:arm64"
161161
environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}
162162

163163
[tool.cibuildwheel.windows]
164-
environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS=""}
164+
environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
165165

166166
[[tool.cibuildwheel.overrides]]
167167
select = "*-win32"
168-
environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32" }
168+
environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}
169169

170170
[tool.meson-python.args]
171171
setup = ['--vsenv']

‎tools/wheels/cibw_before_build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ if [[ $RUNNER_OS == "Linux" || $RUNNER_OS == "macOS" ]] ; then
3131
elif [[ $RUNNER_OS == "Windows" ]]; then
3232
PYTHONPATH=tools python -c "import openblas_support; openblas_support.make_init('numpy')"
3333
target=$(python tools/openblas_support.py)
34-
ls /tmp
3534
mkdir -p openblas
3635
# bash on windows does not like cp -r $target/* openblas
3736
for f in $(ls $target); do
3837
cp -r $target/$f openblas
3938
done
4039
ls openblas
41-
echo "PKG_CONFIG_PATH=$PWD/openblas/lib/pkgconfig;" >> $env:GITHUB_ENV
4240
fi
4341

4442
if [[ $RUNNER_OS == "macOS" ]]; then

0 commit comments

Comments
 (0)
0