From 96ea3f3b2755ec1fcae41001de1baacc6642cb6c Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 09:22:54 -0700 Subject: [PATCH] postbeta --- plugins/opencv/package-lock.json | 4 ++-- plugins/opencv/package.json | 5 ++--- server/package-lock.json | 4 ++-- server/package.json | 2 +- server/python/plugin_remote.py | 5 +++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/opencv/package-lock.json b/plugins/opencv/package-lock.json index 555a3f458..0f5968aed 100644 --- a/plugins/opencv/package-lock.json +++ b/plugins/opencv/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/opencv", - "version": "0.0.84", + "version": "0.0.85", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/opencv", - "version": "0.0.84", + "version": "0.0.85", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/opencv/package.json b/plugins/opencv/package.json index 43304e26b..981967b17 100644 --- a/plugins/opencv/package.json +++ b/plugins/opencv/package.json @@ -26,8 +26,7 @@ "runtime": "python", "type": "API", "interfaces": [ - "ObjectDetection", - "Settings" + "ObjectDetection" ], "pluginDependencies": [ "@scrypted/objectdetector", @@ -37,5 +36,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.0.84" + "version": "0.0.85" } diff --git a/server/package-lock.json b/server/package-lock.json index dd12d9273..31e2b8e3e 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.37.0", + "version": "0.38.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.37.0", + "version": "0.38.0", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.10", diff --git a/server/package.json b/server/package.json index ca296cc74..6721c36dd 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/server", - "version": "0.38.0", + "version": "0.39.0", "description": "", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.10", diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py index 6fa513d75..56adf5736 100644 --- a/server/python/plugin_remote.py +++ b/server/python/plugin_remote.py @@ -611,12 +611,13 @@ class PluginRemote: pipArgs = [ sys.executable, '-m', 'pip', 'install', '-r', requirementstxt, - # preevent uninstalling system packages - '--ignore-installed', '--prefix', python_prefix ] if pythonVersion: print('Specific Python verison requested. Forcing reinstall.') + # prevent uninstalling system packages. + pipArgs.append('--ignore-installed') + # force reinstall even if it exists in system packages. pipArgs.append('--force-reinstall') p = subprocess.Popen(pipArgs, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)