Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mergin/local_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions mergin/test/test_local_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def test_local_changes_from_dict():
"path": "base.gpkg",
"size": 98304,
"version": "v1",
"diffs": ["diff"],
}
],
}
Expand Down
2 changes: 1 addition & 1 deletion mergin/version.py
Original file line number Diff line number Diff line change
@@ -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/
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
Loading