Skip to content
This repository was archived by the owner on Oct 8, 2024. It is now read-only.

Fix failing main build #236

Merged
mergify merged 2 commits into from
Dec 29, 2021
Merged

Fix failing main build #236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de4d624
Do not use libtiff 4.3.0 on macOS builds
radarhere Dec 29, 2021
136ab89
Limit numpy on 32-bit to 1.21.4 for Python 3.10 and 1.20.3 for PyPy
radarhere Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function pre_build {
build_jpeg
CFLAGS=$ORIGINAL_CFLAGS

if [[ -n "$IS_MACOS" && $MACOSX_DEPLOYMENT_TARGET == "11.0" ]]; then
if [[ -n "$IS_MACOS" ]]; then
TIFF_VERSION=4.2.0
fi
build_tiff
Expand Down Expand Up @@ -133,9 +133,11 @@ function run_tests {
brew install openblas
echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg
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
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
fi

Expand Down