From ff0ce5eeb9e32da08029b6c867171d23f5de742f Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Tue, 10 Feb 2026 20:52:57 +0100 Subject: [PATCH 1/2] from compare file_set is coming diffs key as diffs are accidentaly stored in mergin.json --- mergin/local_changes.py | 2 ++ mergin/test/test_local_changes.py | 1 + 2 files changed, 3 insertions(+) diff --git a/mergin/local_changes.py b/mergin/local_changes.py index f0a235d..2b5ba8a 100644 --- a/mergin/local_changes.py +++ b/mergin/local_changes.py @@ -45,6 +45,8 @@ class FileChange: history: Optional[dict] = None # some functions (MerginProject.compare_file_sets) are adding location dict to the change from project info location: Optional[str] = None + # list of diff filenames associated with this change + diffs: Optional[List[str]] = None def get_diff(self) -> Optional[FileDiffChange]: if self.diff: diff --git a/mergin/test/test_local_changes.py b/mergin/test/test_local_changes.py index 2c3d878..4366f5d 100644 --- a/mergin/test/test_local_changes.py +++ b/mergin/test/test_local_changes.py @@ -28,6 +28,7 @@ def test_local_changes_from_dict(): "path": "base.gpkg", "size": 98304, "version": "v1", + "diffs": ["diff"], } ], } From 16f50b49e5ccf13933a9b562ab42690167802586 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Thu, 12 Feb 2026 14:38:01 +0100 Subject: [PATCH 2/2] Bump version 0.12.2 --- mergin/version.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mergin/version.py b/mergin/version.py index 73b936c..0e95ca8 100644 --- a/mergin/version.py +++ b/mergin/version.py @@ -1,5 +1,5 @@ # The version is also stored in ../setup.py -__version__ = "0.12.1" +__version__ = "0.12.2" # There seems to be no single nice way to keep version info just in one place: # https://packaging.python.org/guides/single-sourcing-package-version/ diff --git a/setup.py b/setup.py index fc7325c..25b80b0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name="mergin-client", - version="0.12.1", + version="0.12.2", url="https://github.com/MerginMaps/python-api-client", license="MIT", author="Lutra Consulting Ltd.",