From 0d1ae533686087e154a90fa3798ba6b4cf8fcaec Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 8 Sep 2021 12:18:19 +0200 Subject: [PATCH 1/2] Upgrade to numpy 1.21 to prepare for Python 3.10 Fixes #525 Numpy's Python 3.10 statements at https://github.com/numpy/numpy/releases Python 3.10 release candidate 2 https://www.python.org/downloads/release/python-3100rc2 https://github.com/actions/python-versions/releases --> 3.10.0-rc.2 --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5a2849f3..536d66bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,8 +3,9 @@ requires = [ "setuptools", "wheel", "scikit-build", "cmake", "pip", "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'", "numpy==1.19.3; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'", - "numpy==1.21.0; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'", + "numpy==1.21.2; python_version>='3.6' and sys_platform == 'darwin' and platform_machine == 'arm64'", "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'", "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'", - "numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64' 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' and platform_machine != 'aarch64' and platform_machine != 'arm64'" ] From 1e79aae689a83b16abb06244f0ae8520a8f84881 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 8 Sep 2021 12:45:05 +0200 Subject: [PATCH 2/2] Upgrade to numpy 1.21 to prepare for Python 3.10 --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 612a080c..41951f9e 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,9 @@ def main(): minimum_supported_numpy = "1.17.3" if sys.version_info[:2] >= (3, 9): minimum_supported_numpy = "1.19.3" + if sys.version_info[:2] >= (3, 10): + minimum_supported_numpy = "1.21.2" + # linux arm64 is a special case if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64": @@ -37,7 +40,7 @@ def main(): # macos arm64 is a special case if sys.platform == "darwin" and sys.version_info[:2] >= (3, 6) and platform.machine() == "arm64": - minimum_supported_numpy = "1.21.0" + minimum_supported_numpy = "1.21.2" numpy_version = "numpy>=%s" % minimum_supported_numpy