Merge branch 'main' of github.com:koush/scrypted

koush · Dec 29, 2024 · 9321a5e · 9321a5e
2 parents 1622a0b + 55cb62c
commit 9321a5e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -19,7 +19,7 @@
     "node-dijkstra": "^2.5.0",
     "node-forge": "^1.3.1",
     "node-gyp": "^10.2.0",
-    "py": "npm:@bjia56/portable-python@^0.1.94",
+    "py": "npm:@bjia56/portable-python@^0.1.112",
     "semver": "^7.6.3",
     "sharp": "^0.33.5",
     "source-map-support": "^0.5.21",

diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py
@@ -41,6 +41,12 @@
 ptpython
 wheel
 """.strip()
+if sys.version_info.minor >= 13:
+    # telnetlib was removed in Python 3.13
+    SCRYPTED_REQUIREMENTS = f"""
+{SCRYPTED_REQUIREMENTS}
+standard-telnetlib
+""".strip()
 
 
 class SystemDeviceState(TypedDict):
@@ -797,7 +803,7 @@ def read_requirements(filename: str) -> str:
             )
 
             need_pip = False
-            # pip is needed if there's a requiremnts.txt file that has changed.
+            # pip is needed if there's a requirements.txt file that has changed.
             if str_requirements:
                 need_pip = need_requirements(requirements_basename, str_requirements)
             # pip is needed if the base scrypted requirements have changed.
@@ -933,7 +939,7 @@ async def waitClusterForkKilled():
                             directGetRemote, rpc.RpcPeer.PROPERTY_PROXY_PEER
                         )
                         return await finishFork(forkPeer)
-                    
+
                     async def getClusterForkWrapped():
                         try:
                             return await getClusterFork()