Merge pull request #236 from radarhere/fixes

Fix failing main build

Author: mergify[bot]

config.sh

@@ -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
@@ -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