Add QGIS tests for 3.34 and 3.40

3liz · Nov 22, 2024 · 98f69e4 · 98f69e4
1 parent 9bc771c
commit 98f69e4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,8 +68,38 @@ jobs:
           -v ${GITHUB_WORKSPACE}/.local:/.local
           3liz/qgis-platform:3.22
           ./tests/run-tests.sh
+ 
+      - name: Running Qgis 3.28 tests
+        run: >-
+          docker run
+          --rm
+          --name qgis-server
+          -u $(id -u)
+          -v ${GITHUB_WORKSPACE}/.cache:/.cache
+          -e PIP_CACHE_DIR=/.cache
+          -w /src
+          -e PYTEST_ADDOPTS=""
+          -v ${GITHUB_WORKSPACE}:/src
+          -v ${GITHUB_WORKSPACE}/.local:/.local
+          3liz/qgis-platform:3.28
+          ./tests/run-tests.sh
+
+      - name: Running Qgis 3.34 tests
+        run: >-
+          docker run
+          --rm
+          --name qgis-server
+          -u $(id -u)
+          -v ${GITHUB_WORKSPACE}/.cache:/.cache
+          -e PIP_CACHE_DIR=/.cache
+          -w /src
+          -e PYTEST_ADDOPTS=""
+          -v ${GITHUB_WORKSPACE}:/src
+          -v ${GITHUB_WORKSPACE}/.local:/.local
+          3liz/qgis-platform:3.34
+          ./tests/run-tests.sh
 
-      - name: Running Qgis 3.26 tests
+      - name: Running Qgis 3.40 tests
         run: >-
           docker run
           --rm
@@ -81,9 +111,10 @@ jobs:
           -e PYTEST_ADDOPTS=""
           -v ${GITHUB_WORKSPACE}:/src
           -v ${GITHUB_WORKSPACE}/.local:/.local
-          3liz/qgis-platform:3.26
+          3liz/qgis-platform:3.40
           ./tests/run-tests.sh
 
+
   release:
     needs: [test-server]
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -4,11 +4,11 @@
 import os
 import sys
 
+from typing import Any, Dict, Generator
+
 import lxml.etree
 import pytest
 
-from typing import Any, Dict, Generator
-
 from qgis.core import Qgis, QgsApplication, QgsFontUtils, QgsProject
 from qgis.server import (
     QgsBufferServerRequest,

diff --git a/tilesForServer/tmsapi.py b/tilesForServer/tmsapi.py
@@ -2,8 +2,7 @@
 
 from pathlib import Path
 
-from qgis.core import (
-    # QgsVectorTileMVTEncoder, #define SIP_NO_FILE
+from qgis.core import (  # QgsVectorTileMVTEncoder, #define SIP_NO_FILE
     Qgis,
     QgsCoordinateReferenceSystem,
     QgsCoordinateTransform,