Merge remote-tracking branch 'origin/v2-pull-integration' into pull-initial

Author: MarcelGeo

.github/workflows/autotests.yml

@@ -2,10 +2,6 @@ name: Auto Tests
 on: [push]
 env:
   TEST_MERGIN_URL: https://app.dev.merginmaps.com/
-  TEST_API_USERNAME: test_plugin
-  TEST_API_PASSWORD: ${{ secrets.MERGINTEST_API_PASSWORD }}
-  TEST_API_USERNAME2: test_plugin2
-  TEST_API_PASSWORD2: ${{ secrets.MERGINTEST_API_PASSWORD2 }}
 
 concurrency:
   group: ci-${{github.ref}}-autotests

.github/workflows/notify-milestone.yml

@@ -0,0 +1,20 @@
+name: Notify releases repo
+
+on:
+  milestone:
+    types: [created, edited]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch to releases repo
+        env:
+          GH_TOKEN: ${{ secrets.MM_RELEASES_SYNC_TOKEN }}
+        run: |
+          gh api repos/MerginMaps/releases/dispatches \
+            --method POST \
+            -f event_type=milestone-${{ github.event.action }} \
+            -f 'client_payload[repo]=${{ github.repository }}' \
+            -f 'client_payload[milestone_title]=${{ github.event.milestone.title }}' \
+            -f 'client_payload[milestone_url]=${{ github.event.milestone.html_url }}'

README.md

@@ -99,7 +99,7 @@ To download a specific version of a project:
 $ mergin --username john download --version v42 john/project1 ~/mergin/project1
 ```
 
-To download a sepecific version of a single file:
+To download a specific version of a single file:
 
 1. First you need to download the project:
 ```
@@ -183,13 +183,12 @@ For running test do:
 
 ```bash
     cd mergin
+    # TEST_ related vairables are optional
     export TEST_MERGIN_URL=<url> # testing server
     export TEST_API_USERNAME=<username>
     export TEST_API_PASSWORD=<pwd>
     export TEST_API_USERNAME2=<username2>
     export TEST_API_PASSWORD2=<pwd2>
-    # workspace name with controlled available storage space (e.g. 20MB), default value: testpluginstorage
-    export TEST_STORAGE_WORKSPACE=<workspacename>
     pip install pytest pytest-cov coveralls
     pytest --cov-report html --cov=mergin mergin/test/
 ```

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:

mergin/merginproject.py

@@ -334,10 +334,10 @@ def compare_file_sets(self, origin: List[Dict], current: List[Dict]):
 
         :Example:
 
-        >>> origin = [{'checksum': '08b0e8caddafe74bf5c11a45f65cedf974210fed', 'path': 'base.gpkg', 'size': 2793, 'mtime': '2019-08-26T11:08:34.051221+02:00'}]
-        >>> current = [{'checksum': 'c9a4fd2afd513a97aba19d450396a4c9df8b2ba4', 'path': 'test.qgs', 'size': 31980, 'mtime': '2019-08-26T11:09:30.051221+02:00'}]
+        >>> origin = [{'checksum': '1111111111111111111111111111111111111111', 'path': 'base.gpkg', 'size': 2793, 'mtime': '2019-08-26T11:08:34.051221+02:00'}]
+        >>> current = [{'checksum': '2222222222222222222222222222222222222222', 'path': 'test.qgs', 'size': 31980, 'mtime': '2019-08-26T11:09:30.051221+02:00'}]
         >>> self.compare_file_sets(origin, current)
-        {"added": [{'checksum': 'c9a4fd2afd513a97aba19d450396a4c9df8b2ba4', 'path': 'test.qgs', 'size': 31980, 'mtime': '2019-08-26T11:09:30.051221+02:00'}], "removed": [[{'checksum': '08b0e8caddafe74bf5c11a45f65cedf974210fed', 'path': 'base.gpkg', 'size': 2793, 'mtime': '2019-08-26T11:08:34.051221+02:00'}]], "renamed": [], "updated": []}
+        {"added": [{'checksum': '2222222222222222222222222222222222222222', 'path': 'test.qgs', 'size': 31980, 'mtime': '2019-08-26T11:09:30.051221+02:00'}], "removed": [[{'checksum': '1111111111111111111111111111111111111111', 'path': 'base.gpkg', 'size': 2793, 'mtime': '2019-08-26T11:08:34.051221+02:00'}]], "renamed": [], "updated": []}
 
         :param origin: origin set of files metadata
         :type origin: list[dict]