detect: pin numpy to prevent usage of 2.0

koush · Jun 16, 2024 · dc88e0b · dc88e0b
1 parent 14a9f95
commit dc88e0b
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 30 deletions.
diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json
diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.63"
+   "version": "0.1.64"
 }
diff --git a/plugins/coreml/src/requirements.txt b/plugins/coreml/src/requirements.txt
@@ -1,3 +1,4 @@
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
 numpy==1.26.4
 coremltools==7.1
 Pillow==10.3.0
diff --git a/plugins/onnx/package-lock.json b/plugins/onnx/package-lock.json
diff --git a/plugins/onnx/package.json b/plugins/onnx/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.100"
+   "version": "0.1.101"
 }
diff --git a/plugins/onnx/src/requirements.optional.txt b/plugins/onnx/src/requirements.optional.txt
@@ -1 +1 @@
-opencv-python==4.9.0.80
+opencv-python==4.10.0.82
diff --git a/plugins/onnx/src/requirements.txt b/plugins/onnx/src/requirements.txt
@@ -1,4 +1,6 @@
-# uncomment to require cuda 12, but most stuff is still targetting cuda 11.
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
+numpy==1.26.4# uncomment to require cuda 12, but most stuff is still targetting cuda 11.
+
 # however, stuff targetted for cuda 11 can still run on cuda 12.
 # --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 onnxruntime-gpu; 'linux' in sys_platform and platform_machine == 'x86_64'

diff --git a/plugins/opencv/package-lock.json b/plugins/opencv/package-lock.json
diff --git a/plugins/opencv/package.json b/plugins/opencv/package.json
@@ -37,5 +37,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.0.90"
+   "version": "0.0.91"
 }
diff --git a/plugins/opencv/src/requirements.txt b/plugins/opencv/src/requirements.txt
@@ -1,13 +1,5 @@
-# plugin
-numpy>=1.16.2
-
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
+numpy==1.26.4
 imutils>=0.5.0
-
-# locked to version because 4.8.0.76 is broken.
-# todo: check newer versions.
-opencv-python==4.8.0.74
-
-# pillow-simd is available on x64 linux
-# pillow-simd confirmed not building with arm64 linux or apple silicon
-Pillow>=5.4.1; 'linux' not in sys_platform or platform_machine != 'x86_64'
-pillow-simd; 'linux' in sys_platform and platform_machine == 'x86_64'
+opencv-python==4.10.0.82
+Pillow==10.3.0
diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json
diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.102"
+   "version": "0.1.103"
 }
diff --git a/plugins/openvino/src/requirements.optional.txt b/plugins/openvino/src/requirements.optional.txt
@@ -1 +1 @@
-opencv-python==4.9.0.80
+opencv-python==4.10.0.82
diff --git a/plugins/openvino/src/requirements.txt b/plugins/openvino/src/requirements.txt
@@ -1,2 +1,4 @@
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
+numpy==1.26.4
 openvino==2024.1.0
 Pillow==10.3.0
diff --git a/plugins/tensorflow-lite/package-lock.json b/plugins/tensorflow-lite/package-lock.json
diff --git a/plugins/tensorflow-lite/package.json b/plugins/tensorflow-lite/package.json
@@ -53,5 +53,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.61"
+   "version": "0.1.62"
 }
diff --git a/plugins/tensorflow-lite/src/requirements.txt b/plugins/tensorflow-lite/src/requirements.txt
@@ -1,4 +1,6 @@
 --extra-index-url https://google-coral.github.io/py-repo/
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
+numpy==1.26.4
 pycoral~=2.0
 tflite-runtime==2.5.0.post1
 Pillow==10.3.0