From a5c7b6840262812473137c3dbd9d7871bbbe829e Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Wed, 20 May 2026 13:45:01 +0200 Subject: [PATCH 1/3] Bump 2026.4.1 --- .github/workflows/packages.yml | 2 +- Mergin/metadata.txt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index f3f862e5..45864e58 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -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: diff --git a/Mergin/metadata.txt b/Mergin/metadata.txt index 5487688f..f2e2d755 100644 --- a/Mergin/metadata.txt +++ b/Mergin/metadata.txt @@ -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 +

2026.4.0 - Integrated V2 pull mechanism

2026.3.0 - Added support to create filters From abc33968382f1c57854a902632463c1caae278b3 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Wed, 20 May 2026 14:05:17 +0200 Subject: [PATCH 2/3] Install setuptools to tests --- .github/workflows/run-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index 465f0929..f345671c 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -66,7 +66,7 @@ jobs: conda install -n qgis_env qgis=${{ matrix.qgis-version }} pytest pytest-qt pytest-cov --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 + conda run -n qgis_env pip install python-dateutil pytz wheel setuptools - name: Install python-api-client dependencies run: | From 0591f276744bf9f4d63471d5909786a303059ec9 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Wed, 20 May 2026 14:16:29 +0200 Subject: [PATCH 3/3] run tests with setuptools --- .github/workflows/run-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index f345671c..8a182b49 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -63,10 +63,10 @@ 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 setuptools + conda run -n qgis_env pip install python-dateutil pytz wheel - name: Install python-api-client dependencies run: |