black -l 120

Author: DanChov

mergin/client_push.py

@@ -333,10 +333,12 @@ def _geodiff_changes_count(mp: MerginProject, diff_rel_path: str):
 
     try:
         from pygeodiff import GeoDiff, GeoDiffLibError
+
         return GeoDiff().changes_count(diff_abs)
     except GeoDiffLibError:
         return None
 
+
 def push_project_cancel(job):
     """
     To be called (from main thread) to cancel a job that has uploads in progress.

mergin/test/test_push_logging.py

@@ -8,6 +8,7 @@
 from mergin.client_push import push_project_finalize, UploadJob
 from mergin.common import ClientError
 
+
 @pytest.mark.parametrize("status_code", [502, 504])
 def test_push_finalize_logs_on_5xx_real_diff(caplog, status_code, tmp_path):
     # --- data ---
@@ -30,17 +31,26 @@ def test_push_finalize_logs_on_5xx_real_diff(caplog, status_code, tmp_path):
 
     # --- fake MP/MC len tam, kde treba ---
     class MP:
-        def __init__(self, log): self.log = log
-        def update_metadata(self, *a, **k): pass
-        def apply_push_changes(self, *a, **k): pass
-        def fpath_meta(self, rel): return str(diff_path) if rel == diff_path.name else rel
+        def __init__(self, log):
+            self.log = log
+
+        def update_metadata(self, *a, **k):
+            pass
+
+        def apply_push_changes(self, *a, **k):
+            pass
+
+        def fpath_meta(self, rel):
+            return str(diff_path) if rel == diff_path.name else rel
 
     tx = "tx-1"
 
     class MC:
         def post(self, url, *args, **kwargs):
             if url.endswith(f"/v1/project/push/finish/{tx}"):
-                err = ClientError("Gateway error"); setattr(err, "http_error", status_code); raise err
+                err = ClientError("Gateway error")
+                setattr(err, "http_error", status_code)
+                raise err
             if url.endswith(f"/v1/project/push/cancel/{tx}"):
                 return SimpleNamespace(msg="cancelled")
             return SimpleNamespace(msg="ok")
@@ -52,12 +62,14 @@ def post(self, url, *args, **kwargs):
         project_path="u/p",
         changes={
             "added": [],
-            "updated": [{
-                "path": modified.name,
-                "size": file_size,
-                "diff": {"path": diff_path.name, "size": diff_size},
-                "chunks": [1],
-            }],
+            "updated": [
+                {
+                    "path": modified.name,
+                    "size": file_size,
+                    "diff": {"path": diff_path.name, "size": diff_size},
+                    "chunks": [1],
+                }
+            ],
             "removed": [],
         },
         transaction_id=tx,
@@ -84,4 +96,4 @@ def post(self, url, *args, **kwargs):
     assert modified.name in text
     assert f"size={file_size}" in text
     assert f"diff_size={diff_size}" in text
-    assert ("changes=" in text) or ("changes=n/a" in text)
+    assert ("changes=" in text) or ("changes=n/a" in text)