collab-runtime 0.9.1__tar.gz → 0.9.2__tar.gz

{collab_runtime-0.9.1/collab_runtime.egg-info → collab_runtime-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: collab-runtime
-Version: 0.9.1
+Version: 0.9.2
 Summary: Collaborative file locking runtime
 Author-email: KirilMT <kiril.mt95@gmail.com>
 License-Expression: MIT
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Version Control
-Requires-Python: >=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dotenv>=1.2.2
@@ -21,6 +21,7 @@ Requires-Dist: supabase>=2.30.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: psutil>=5.9.8
 Requires-Dist: plyer>=2.1.0
+Requires-Dist: tomli>=2.0.0
 Dynamic: license-file
 
 # collab-runtime — Collaborative File Locking

{collab_runtime-0.9.1 → collab_runtime-0.9.2}/collab/dashboard_server.py

@@ -17,12 +17,13 @@ import re
 import tempfile
 import threading
 import time
-import tomllib
 import urllib.parse
 import zipfile
 from pathlib import Path
 from typing import Any, Callable, Iterable, Optional, Sequence, Tuple
 
+import tomli as tomllib
+
 logger = logging.getLogger(__name__)
 
 DASHBOARD_TEMP_PREFIX = ".collab-dashboard-"

{collab_runtime-0.9.1 → collab_runtime-0.9.2}/collab/overlap.py

@@ -308,6 +308,11 @@ def merge_tree_conflicts(
             conflicted.add(line.strip())
         # rc==1 with nothing parseable -> inconclusive; fall back to file-level.
         return frozenset(conflicted) if conflicted else None
+    # rc != 0,1: the merge-tree command itself failed (e.g. rc=128 "refusing to
+    # merge unrelated histories" in a shallow clone, or unsupported git version).
+    logger.debug(
+        "merge-tree exited rc=%d for %s..%s; inconclusive", rc, head_ref, other_ref
+    )
     return None
 
 
@@ -376,6 +381,24 @@ def fetch_pr_ref(
             "Fetched SHA %s != expected %s for PR #%d", fetched_sha, head_sha, pr_number
         )
         # Still usable (the ref exists), but log the discrepancy.
+
+    # If the checkout is shallow (e.g. actions/checkout@v4 default fetch-depth: 1),
+    # unshallow now so that git merge-tree can find the merge base.  Without this,
+    # merge-tree exits rc=128 ("refusing to merge unrelated histories") and
+    # merge_tree_conflicts returns None (inconclusive).
+    rc_shallow, shallow_out = capture(["rev-parse", "--is-shallow-repository"])
+    if rc_shallow == 0 and shallow_out.strip() == "true":
+        logger.debug("Shallow clone detected; unshallowing from %s", remote)
+        rc_unshallow, _ = capture(["fetch", "--unshallow", remote])
+        if rc_unshallow != 0:
+            # Best-effort fallback: deepen history so merge-tree has a
+            # reasonable chance of finding the merge base.
+            logger.debug(
+                "--unshallow failed (rc=%d); trying --deepen=50 as fallback",
+                rc_unshallow,
+            )
+            capture(["fetch", "--deepen=50", remote])
+
     return local_ref
 
 

{collab_runtime-0.9.1 → collab_runtime-0.9.2}/collab/safe_subprocess.py

@@ -272,7 +272,7 @@ def capture(
     sp = get_subprocess()
     safe_argv = validate_argv(argv, policy=policy)
     kwargs: dict[str, Any] = {
-        "stderr": sp.DEVNULL,
+        "stderr": sp.PIPE,
         "timeout": timeout,
         "cwd": cwd,
     }

{collab_runtime-0.9.1 → collab_runtime-0.9.2/collab_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: collab-runtime
-Version: 0.9.1
+Version: 0.9.2
 Summary: Collaborative file locking runtime
 Author-email: KirilMT <kiril.mt95@gmail.com>
 License-Expression: MIT
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Version Control
-Requires-Python: >=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dotenv>=1.2.2
@@ -21,6 +21,7 @@ Requires-Dist: supabase>=2.30.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: psutil>=5.9.8
 Requires-Dist: plyer>=2.1.0
+Requires-Dist: tomli>=2.0.0
 Dynamic: license-file
 
 # collab-runtime — Collaborative File Locking

{collab_runtime-0.9.1 → collab_runtime-0.9.2}/collab_runtime.egg-info/requires.txt

@@ -3,3 +3,4 @@ supabase>=2.30.0
 httpx>=0.28.1
 psutil>=5.9.8
 plyer>=2.1.0
+tomli>=2.0.0

{collab_runtime-0.9.1 → collab_runtime-0.9.2}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "collab-runtime"
-version = "0.9.1"
+version = "0.9.2"
 description = "Collaborative file locking runtime"
 readme = "docs/pypi/README.md"
 license = "MIT"
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.14"
 authors = [
   { name = "KirilMT", email = "kiril.mt95@gmail.com" }
 ]
@@ -28,7 +28,8 @@ dependencies = [
   "supabase>=2.30.0",
   "httpx>=0.28.1",
   "psutil>=5.9.8",
-  "plyer>=2.1.0"
+  "plyer>=2.1.0",
+  "tomli>=2.0.0",
 ]
 
 [project.scripts]