From f59c8680ff27c4d70fb5cd50a5490b10103c3813 Mon Sep 17 00:00:00 2001 From: Herman Snevajs Date: Tue, 16 Sep 2025 09:14:34 +0200 Subject: [PATCH 1/3] import geodiff from deps in client_push --- mergin/client_push.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/mergin/client_push.py b/mergin/client_push.py index cc5a036..353f300 100644 --- a/mergin/client_push.py +++ b/mergin/client_push.py @@ -15,13 +15,10 @@ import tempfile import concurrent.futures import os -from pygeodiff import ( - GeoDiff, - GeoDiffLibError, - GeoDiffLibConflictError, - GeoDiffLibUnsupportedChangeError, - GeoDiffLibVersionError, -) +try: + from .deps import pygeodiff +except (ImportError, ModuleNotFoundError): + import pygeodiff from .common import UPLOAD_CHUNK_SIZE, ClientError from .merginproject import MerginProject @@ -338,12 +335,12 @@ def _geodiff_changes_count(mp: MerginProject, diff_rel_path: str): diff_abs = mp.fpath_meta(diff_rel_path) try: - return GeoDiff().changes_count(diff_abs) + return pygeodiff.GeoDiff().changes_count(diff_abs) except ( - GeoDiffLibError, - GeoDiffLibConflictError, - GeoDiffLibUnsupportedChangeError, - GeoDiffLibVersionError, + pygeodiff.GeoDiffLibError, + pygeodiff.GeoDiffLibConflictError, + pygeodiff.GeoDiffLibUnsupportedChangeError, + pygeodiff.GeoDiffLibVersionError, FileNotFoundError, ): return None From d8b321132ec8f49edd092eee9c625904f4f9bd5b Mon Sep 17 00:00:00 2001 From: Herman Snevajs Date: Tue, 16 Sep 2025 09:18:22 +0200 Subject: [PATCH 2/3] black --- mergin/client_push.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mergin/client_push.py b/mergin/client_push.py index 353f300..d613b1b 100644 --- a/mergin/client_push.py +++ b/mergin/client_push.py @@ -15,6 +15,7 @@ import tempfile import concurrent.futures import os + try: from .deps import pygeodiff except (ImportError, ModuleNotFoundError): From 4013d6991a90291be2873c4bb84871b368643d67 Mon Sep 17 00:00:00 2001 From: Herman Snevajs Date: Tue, 16 Sep 2025 10:26:17 +0200 Subject: [PATCH 3/3] import pygeodiff form merginproject --- mergin/client_push.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mergin/client_push.py b/mergin/client_push.py index d613b1b..f6c0e02 100644 --- a/mergin/client_push.py +++ b/mergin/client_push.py @@ -16,13 +16,8 @@ import concurrent.futures import os -try: - from .deps import pygeodiff -except (ImportError, ModuleNotFoundError): - import pygeodiff - from .common import UPLOAD_CHUNK_SIZE, ClientError -from .merginproject import MerginProject +from .merginproject import MerginProject, pygeodiff from .editor import filter_changes from .utils import cleanup_tmp_dir