Merge pull request #722 from asenyaev/asen/update_5.x_with_4.x

Update 5.x branch

Author: asenyaev

.github/workflows/build_wheels_macos.yml

@@ -49,7 +49,7 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
-      MACOSX_DEPLOYMENT_TARGET: 10.15
+      MACOSX_DEPLOYMENT_TARGET: 10.13
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete

pyproject.toml

@@ -8,5 +8,6 @@ requires = [
   "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
   "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.21.2; python_version>='3.10'"
+  "numpy==1.21.2; python_version>='3.10'",
+  "numpy==1.21.4; python_version>='3.10' and platform_system=='Darwin'"
 ]

setup.py

@@ -30,7 +30,8 @@ def main():
         'numpy>=1.19.3; python_version>="3.9"',
         'numpy>=1.21.2; python_version>="3.10"',
         'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
-        'numpy>=1.21.2; python_version>="3.6" and platform_system=="Darwin" and platform_machine=="arm64"',
+        'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
+        'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
     ]
 
     python_version = cmaker.CMaker.get_python_version()