diff --git a/server/bin/postinstall b/server/bin/postinstall index e04c23212..c9edeccfe 100644 --- a/server/bin/postinstall +++ b/server/bin/postinstall @@ -17,11 +17,8 @@ async function installScryptedServerRequirements() { await py.install(); python = py.executablePath; - await pipInstall('wheel'); await pipInstall('debugpy'); await pipInstall('psutil').catch(() => {}); - await pipInstall('prompt_toolkit'); - await pipInstall('ptpython'); } installScryptedServerRequirements(); diff --git a/server/package-lock.json b/server/package-lock.json index d0dc2453b..e49708807 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.94.21", + "version": "0.94.22", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.94.21", + "version": "0.94.22", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py index 6967cb821..06eb76101 100644 --- a/server/python/plugin_remote.py +++ b/server/python/plugin_remote.py @@ -32,6 +32,11 @@ from scrypted_python.scrypted_sdk.types import (Device, DeviceManifest, ScryptedInterfaceProperty, Storage) +SCRYPTED_REQUIREMENTS = """ +ptpython +wheel +""".strip() + class ClusterObject(TypedDict): id: str port: int @@ -571,13 +576,14 @@ class PluginRemote: pip_target, 'requirements.scrypted') requirements_basename = os.path.join( pip_target, 'requirements') - debug_requirements_basename = os.path.join(pip_target, 'requirements.debug') optional_requirements_basename = os.path.join( pip_target, 'requirements.optional') need_pip = True if str_requirements: need_pip = need_requirements(requirements_basename, str_requirements) + if not need_pip: + need_pip = need_requirements(scrypted_requirements_basename, SCRYPTED_REQUIREMENTS) if need_pip: remove_pip_dirs(plugin_volume)