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: 1 addition & 1 deletion .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
default: '2.2.0'
type: string
env:
PYTHON_API_CLIENT_VER: ${{ inputs.REQUESTED_PYTHON_API_CLIENT_VER || '0.13.0' }}
PYTHON_API_CLIENT_VER: ${{ inputs.REQUESTED_PYTHON_API_CLIENT_VER || '0.13.1' }}
GEODIFF_VER: ${{ inputs.REQUESTED_GEODIFF_VER || '2.2.0' }}
PYTHON_VER: "38"
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Create environment and install QGIS
run: |
conda create -n qgis_env --no-default-packages --yes
conda install -n qgis_env qgis=${{ matrix.qgis-version }} pytest pytest-qt pytest-cov --yes
conda install -n qgis_env qgis=${{ matrix.qgis-version }} pytest pytest-qt pytest-cov pip setuptools --yes
conda run -n qgis_env pip install --no-cache-dir pytest-qgis
# mergin cilent dependencies
conda run -n qgis_env pip install python-dateutil pytz wheel
Expand Down
7 changes: 5 additions & 2 deletions Mergin/metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ name=Mergin
qgisMinimumVersion=3.22
qgisMaximumVersion=4.99
description=Handle Mergin Maps projects
version=2026.4.0
version=2026.4.1
author=Lutra Consulting
email=info@merginmaps.com
about=Mergin Maps is a repository for storing and tracking changes to QGIS projects/data and has its mobile app for field geo-surveys. With this plugin, users can upload and sync their data to Mergin Maps service.
; end of mandatory metadata

; start of optional metadata
changelog=2026.4.0
changelog=2026.4.1
- Fixed issues in the changes viewer
- Fixed an exception when syncing to a different server
<p>2026.4.0
- Integrated V2 pull mechanism
<p>2026.3.0
- Added support to create filters
Expand Down
Loading