Fix pinning wrong numpy version

TileDB-Inc · Jun 10, 2024 · 3f125a7 · 3f125a7
1 parent f580dc7
commit 3f125a7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/misc/requirements_wheel.txt b/misc/requirements_wheel.txt
@@ -1,12 +1,7 @@
-# numpy pinning for ABI forward-compatibility
-numpy==1.16.5 ; python_version < "3.8" and platform_machine !='aarch64'
-numpy==1.17.* ; python_version == "3.8" and platform_machine !='aarch64'
-numpy==1.19.4 ; python_version == "3.9" and platform_machine !='aarch64'
-
-# NOTE: oldest-supported-numpy (1.19.2) had forward ABI compat problems
-numpy==1.20.* ; python_version < "3.10" and platform_machine=='aarch64'
-numpy==1.21.* ; python_version == "3.10"
-numpy>=1.23.2 ; python_version >= "3.11"
+numpy==1.17.* ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'
+numpy==1.19.* ; python_version == '3.8' and platform_machine == 'aarch64'
+numpy==1.21.* ; python_version == '3.8' and platform_machine == 'arm64'
+numpy>=2.0.0rc2 ; python_version >= '3.9'
 
 #-------------------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,8 +4,10 @@ requires = [
     "wheel",
     "pybind11",
     "Cython",
-    "numpy== 1.17.*,<2.0 ; python_version == '3.8' and platform_machine != 'aarch64'",
-    "numpy>=1.25 ; python_version >= '3.9'",
+    "numpy==1.17.* ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'",
+    "numpy==1.19.* ; python_version == '3.8' and platform_machine == 'aarch64'",
+    "numpy==1.21.* ; python_version == '3.8' and platform_machine == 'arm64'",
+    "numpy>=2.0.0rc2 ; python_version >= '3.9'",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -40,11 +42,10 @@ classifiers=[
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "numpy==1.17.*,<2.0 ; python_version == '3.8' and platform_machine != 'aarch64'",
-    "numpy==1.19.4,<2.0 ; python_version == '3.9' and platform_machine != 'aarch64'",
-    "numpy==1.20.*,<2.0 ; python_version < '3.10' and platform_machine == 'aarch64'",
-    "numpy==1.21.*,<2.0 ; python_version == '3.10'",
-    "numpy>=1.23.2,<2.0 ; python_version >= '3.11'",
+  "numpy>=1.17 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'",
+  "numpy>=1.19 ; python_version == '3.8' and platform_machine == 'aarch64'",
+  "numpy>=1.21 ; python_version == '3.8' and platform_machine == 'arm64'",
+  "numpy>=1.25 ; python_version >= '3.9'",
 ]
 dynamic = ["version"]
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
-numpy>=1.16.5 ; python_version < "3.10" and platform_machine != 'aarch64'
-numpy>=1.19.2 ; python_version < "3.10" and platform_machine == 'aarch64'
-numpy>=1.21.0 ; python_version == "3.10"
-numpy>=1.23.2 ; python_version >= "3.11"
+numpy>=1.17 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'
+numpy>=1.19 ; python_version == '3.8' and platform_machine == 'aarch64'
+numpy>=1.21 ; python_version == '3.8' and platform_machine == 'arm64'
+numpy>=1.25 ; python_version >= '3.9'
 packaging
 
 contextvars ;python_version<"3.7"

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,4 +1,7 @@
-numpy >= 1.16.5
+numpy>=1.17 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'
+numpy>=1.19 ; python_version == '3.8' and platform_machine == 'aarch64'
+numpy>=1.21 ; python_version == '3.8' and platform_machine == 'arm64'
+numpy>=1.25 ; python_version >= '3.9'
 
 # ------------------------------------------------
 # ** MUST sync with misc/requirements_wheel.txt **