Skip to content

Commit d73520e

Browse files
authored
Merge pull request #290 from MerginMaps/fix-missing-diffs-key
Add diffs key to FileChange class
2 parents 4ea17e6 + 16f50b4 commit d73520e

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

mergin/local_changes.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ class FileChange:
4545
history: Optional[dict] = None
4646
# some functions (MerginProject.compare_file_sets) are adding location dict to the change from project info
4747
location: Optional[str] = None
48+
# list of diff filenames associated with this change
49+
diffs: Optional[List[str]] = None
4850

4951
def get_diff(self) -> Optional[FileDiffChange]:
5052
if self.diff:

mergin/test/test_local_changes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ def test_local_changes_from_dict():
2828
"path": "base.gpkg",
2929
"size": 98304,
3030
"version": "v1",
31+
"diffs": ["diff"],
3132
}
3233
],
3334
}

mergin/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# The version is also stored in ../setup.py
2-
__version__ = "0.12.1"
2+
__version__ = "0.12.2"
33

44
# There seems to be no single nice way to keep version info just in one place:
55
# https://packaging.python.org/guides/single-sourcing-package-version/

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setup(
77
name="mergin-client",
8-
version="0.12.1",
8+
version="0.12.2",
99
url="https://github.com/MerginMaps/python-api-client",
1010
license="MIT",
1111
author="Lutra Consulting Ltd.",

0 commit comments

Comments
 (0)