python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-28 02:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #236 from radarhere/fixes

Browse Source 
Fix failing main build
This commit is contained in:
mergify[bot] 2021-12-29 17:18:50 +00:00 committed by GitHub
commit b5387b4e5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.sh
View File

@ -57,7 +57,7 @@ function pre_build {
build_jpeg build_jpeg
CFLAGS=$ORIGINAL_CFLAGS CFLAGS=$ORIGINAL_CFLAGS
if [[ -n "$IS_MACOS" && $MACOSX_DEPLOYMENT_TARGET == "11.0" ]]; then if [[ -n "$IS_MACOS" ]]; then
TIFF_VERSION=4.2.0 TIFF_VERSION=4.2.0
fi fi
build_tiff build_tiff
@ -133,9 +133,11 @@ function run_tests {
brew install openblas brew install openblas
echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg
fi fi
if [[ "$MB_PYTHON_VERSION" == pypy3.7-* ]]; then if [[ "$MB_PYTHON_VERSION" == pypy3.7-* ]] && [[ $(uname -m) == "i686" ]]; then
python3 -m pip install numpy==1.20.3 python3 -m pip install numpy==1.20.3
elif [[ "$MB_PYTHON_VERSION" != 3.10 ]] || [[ "$PLAT" != "x86_64" ]]; then elif [[ "$MB_PYTHON_VERSION" == 3.10 ]] && [[ $(uname -m) == "i686" ]]; then
python3 -m pip install numpy==1.21.4
else
python3 -m pip install numpy python3 -m pip install numpy
fi fi