From dc2a844dea648ef0fd6d69e59f7b8e57b3bd75d9 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Fri, 3 Dec 2021 20:48:09 -0800 Subject: [PATCH] server: publish --- server/package-lock.json | 4 ++-- server/package.json | 2 +- server/python/plugin-remote.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index dbc6c27ff..1d0a78600 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.0.86", + "version": "0.0.88", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.0.86", + "version": "0.0.88", "license": "ISC", "dependencies": { "@scrypted/sdk": "^0.0.127", diff --git a/server/package.json b/server/package.json index eac5a8dc2..8d5e6159e 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/server", - "version": "0.0.86", + "version": "0.0.88", "description": "", "dependencies": { "@scrypted/sdk": "^0.0.127", diff --git a/server/python/plugin-remote.py b/server/python/plugin-remote.py index af9406fec..bb5055780 100644 --- a/server/python/plugin-remote.py +++ b/server/python/plugin-remote.py @@ -159,16 +159,16 @@ class PluginRemote: zip = zipfile.ZipFile(zipPath) - python_modules = os.path.join(os.environ.get('SCRYPTED_PLUGIN_VOLUME'), 'python', 'modules') - if not os.path.exists(python_modules): - os.makedirs(python_modules) + python_prefix = os.path.join(os.environ.get('SCRYPTED_PLUGIN_VOLUME'), 'python') + if not os.path.exists(python_prefix): + os.makedirs(python_prefix) if 'requirements.txt' in zip.namelist(): requirements = zip.open('requirements.txt').read() str_requirements = requirements.decode('utf8') - requirementstxt = os.path.join(python_modules, 'requirements.txt') - installed_requirementstxt = os.path.join(python_modules, 'installed-requirements.txt') + requirementstxt = os.path.join(python_prefix, 'requirements.txt') + installed_requirementstxt = os.path.join(python_prefix, 'installed-requirements.txt') need_pip = True try: @@ -185,8 +185,7 @@ class PluginRemote: f.write(requirements) f.close() - # os.system('pip install -r %s --target %s' % (requirementstxt, python_modules)) - p = subprocess.Popen(['pip', 'install', '-r', requirementstxt, '--target', python_modules], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + p = subprocess.Popen(['pip', 'install', '-r', requirementstxt, '--prefix', python_prefix], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) while True: line = p.stdout.readline() if not line: @@ -206,7 +205,8 @@ class PluginRemote: print(str_requirements) sys.path.insert(0, zipPath) - sys.path.insert(0, python_modules) + site_packages = os.path.join(python_prefix, 'lib/python3.9/site-packages') + sys.path.insert(0, site_packages) from scrypted_sdk import sdk_init # type: ignore self.systemManager = SystemManager(self.api, self.systemState) self.deviceManager = DeviceManager(self.nativeIds, self.systemManager)