@scrypted/server 0.94.21 → 0.94.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/postinstall +0 -3
- package/package.json +1 -1
- package/python/plugin_remote.py +8 -1
package/bin/postinstall
CHANGED
|
@@ -17,11 +17,8 @@ async function installScryptedServerRequirements() {
|
|
|
17
17
|
await py.install();
|
|
18
18
|
python = py.executablePath;
|
|
19
19
|
|
|
20
|
-
await pipInstall('wheel');
|
|
21
20
|
await pipInstall('debugpy');
|
|
22
21
|
await pipInstall('psutil').catch(() => {});
|
|
23
|
-
await pipInstall('prompt_toolkit');
|
|
24
|
-
await pipInstall('ptpython');
|
|
25
22
|
}
|
|
26
23
|
|
|
27
24
|
installScryptedServerRequirements();
|
package/package.json
CHANGED
package/python/plugin_remote.py
CHANGED
|
@@ -32,6 +32,11 @@ from scrypted_python.scrypted_sdk.types import (Device, DeviceManifest,
|
|
|
32
32
|
ScryptedInterfaceProperty,
|
|
33
33
|
Storage)
|
|
34
34
|
|
|
35
|
+
SCRYPTED_REQUIREMENTS = """
|
|
36
|
+
ptpython
|
|
37
|
+
wheel
|
|
38
|
+
""".strip()
|
|
39
|
+
|
|
35
40
|
class ClusterObject(TypedDict):
|
|
36
41
|
id: str
|
|
37
42
|
port: int
|
|
@@ -571,16 +576,18 @@ class PluginRemote:
|
|
|
571
576
|
pip_target, 'requirements.scrypted')
|
|
572
577
|
requirements_basename = os.path.join(
|
|
573
578
|
pip_target, 'requirements')
|
|
574
|
-
debug_requirements_basename = os.path.join(pip_target, 'requirements.debug')
|
|
575
579
|
optional_requirements_basename = os.path.join(
|
|
576
580
|
pip_target, 'requirements.optional')
|
|
577
581
|
|
|
578
582
|
need_pip = True
|
|
579
583
|
if str_requirements:
|
|
580
584
|
need_pip = need_requirements(requirements_basename, str_requirements)
|
|
585
|
+
if not need_pip:
|
|
586
|
+
need_pip = need_requirements(scrypted_requirements_basename, SCRYPTED_REQUIREMENTS)
|
|
581
587
|
|
|
582
588
|
if need_pip:
|
|
583
589
|
remove_pip_dirs(plugin_volume)
|
|
590
|
+
install_with_pip(pip_target, packageJson, SCRYPTED_REQUIREMENTS, scrypted_requirements_basename, ignore_error=True)
|
|
584
591
|
install_with_pip(pip_target, packageJson, str_requirements, requirements_basename, ignore_error=False)
|
|
585
592
|
install_with_pip(pip_target, packageJson, str_optional_requirements, optional_requirements_basename, ignore_error=True)
|
|
586
593
|
else:
|