Fix numpy versions

TileDB-Inc · Jun 17, 2024 · b39279c · b39279c
1 parent b186a71
commit b39279c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 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.*,<2.0 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'
+numpy==1.19.*,<2.0 ; python_version == '3.8' and platform_machine == 'aarch64'
+numpy==1.21.*,<2.0 ; python_version == '3.8' and platform_machine == 'arm64'
+numpy>=1.25,<2.0 ; python_version >= '3.9'
 
 #-------------------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,14 @@
 [build-system]
-requires = ["setuptools>=64", "wheel", "pybind11", "Cython"]
+requires = [
+    "setuptools>=64",
+    "wheel",
+    "pybind11",
+    "Cython",
+    "numpy==1.17.*,<2.0 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'",
+    "numpy==1.19.*,<2.0 ; python_version == '3.8' and platform_machine == 'aarch64'",
+    "numpy==1.21.*,<2.0 ; python_version == '3.8' and platform_machine == 'arm64'",
+    "numpy>=1.25,<2.0 ; python_version >= '3.9'",
+]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -33,7 +42,13 @@ classifiers=[
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
-dynamic = ["version", "dependencies"]
+dependencies = [
+  "numpy>=1.17,<2.0 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'",
+  "numpy>=1.19,<2.0 ; python_version == '3.8' and platform_machine == 'aarch64'",
+  "numpy>=1.21,<2.0 ; python_version == '3.8' and platform_machine == 'arm64'",
+  "numpy>=1.25,<2.0 ; python_version >= '3.9'",
+]
+dynamic = ["version"]
 
 [tool.setuptools.packages.find]
 exclude = ["*.pyc", ".pytest_cache/*", ".hypothesis/*"]

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,<2.0 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'
+numpy>=1.19,<2.0 ; python_version == '3.8' and platform_machine == 'aarch64'
+numpy>=1.21,<2.0 ; python_version == '3.8' and platform_machine == 'arm64'
+numpy>=1.25,<2.0 ; 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,<2.0 ; python_version == '3.8' and platform_machine not in 'arm64|aarch64'
+numpy>=1.19,<2.0 ; python_version == '3.8' and platform_machine == 'aarch64'
+numpy>=1.21,<2.0 ; python_version == '3.8' and platform_machine == 'arm64'
+numpy>=1.25,<2.0 ; python_version >= '3.9'
 
 # ------------------------------------------------
 # ** MUST sync with misc/requirements_wheel.txt **