From a31d6482afaee04721bab6134ef024260ec23177 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 09:12:21 -0700 Subject: [PATCH] postbeta --- server/package-lock.json | 4 ++-- server/package.json | 2 +- server/python/plugin_remote.py | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 6eb1be3cd..dd12d9273 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.36.0", + "version": "0.37.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.36.0", + "version": "0.37.0", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.10", diff --git a/server/package.json b/server/package.json index cc2a92605..ca296cc74 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/server", - "version": "0.37.0", + "version": "0.38.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 cd9315deb..6fa513d75 100644 --- a/server/python/plugin_remote.py +++ b/server/python/plugin_remote.py @@ -603,12 +603,23 @@ class PluginRemote: f.write(requirements) f.close() - p = subprocess.Popen([ + try: + pythonVersion = packageJson['scrypted']['pythonVersion'] + except: + pythonVersion = None + + pipArgs = [ sys.executable, '-m', 'pip', 'install', '-r', requirementstxt, + # preevent uninstalling system packages '--ignore-installed', '--prefix', python_prefix - ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + ] + if pythonVersion: + print('Specific Python verison requested. Forcing reinstall.') + pipArgs.append('--force-reinstall') + + p = subprocess.Popen(pipArgs, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) while True: line = p.stdout.readline()