Merge pull request #88 from 3liz/qgis4-support

dmarteau · web-flow · commit b10f4e1b3692 · 2026-04-02T18:08:39.000+02:00
QGIS4 Support
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
           "3.34",
           "3.40",
           "3.44",
-          "nightly-release",
+          "4.0",
         ]
     steps:
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -41,6 +41,7 @@ qgis-tests:
         "3.34",
         "3.40",
         "3.44",
+        "4.0",
       ]
 
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ authors = [
     { name = "3liz", email = "info@3liz.com" }
 ]
 version = "1.8.4"
-requires-python = ">=3.10"
+requires-python = ">=3.9"
 license = "GPL-2.0-only"
 license-files = ["LICENSE"]
 readme = "README.md"
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -12,7 +12,7 @@
 import pytest
 
 
-from qgis.PyQt import Qt
+from qgis.PyQt.QtCore import QT_VERSION_STR
 
 from qgis.core import Qgis, QgsFontUtils, QgsProject
 from qgis.server import (
@@ -38,7 +38,7 @@ def pytest_report_header(config):
         f"QGIS : {Qgis.versionInt()}\n"
         f"Python GDAL : {gdal.VersionInfo('VERSION_NUM')}\n"
         f"Python : {sys.version}\n"
-        f"QT : {Qt.QT_VERSION_STR}"
+        f"QT : {QT_VERSION_STR}"
     )
 
 
diff --git a/tests/core/qgis.py b/tests/core/qgis.py
@@ -16,6 +16,9 @@
 from qgis.gui import QgisInterface
 from qgis.server import QgsServerInterface
 
+
+QGIS_VERSION_INT = Qgis.versionInt()
+
 #
 # Logger hook
 #
@@ -27,7 +30,7 @@ def install_logger_hook() -> None:
     from qgis.core import Qgis
 
     # Add a hook to qgis  message log
-    def writelogmessage(message, tag, level):
+    def writelogmessage(message, tag, level, *args):
         arg = f"{tag}: {message}"
         if level == Qgis.Warning:
             logging.warning(arg)
@@ -37,8 +40,10 @@ def writelogmessage(message, tag, level):
             logging.debug(arg)
 
     messageLog = QgsApplication.messageLog()
-    messageLog.messageReceived.connect(writelogmessage)
-
+    if QGIS_VERSION_INT < 40000:
+        messageLog.messageReceived.connect(writelogmessage)
+    else:
+        messageLog.messageReceivedWithFormat.connect(writelogmessage)
 
 #
 # Plugin loader
@@ -103,7 +108,7 @@ def _load_plugin(
 
 
 def _check_qgis_version(minver: Optional[str], maxver: Optional[str]) -> bool:
-    version = semver.Version.parse(Qgis.QGIS_VERSION.split("-", maxsplit=1)[0])
+    version = semver.Version.parse(Qgis.version().split("-", maxsplit=1)[0])
 
     def _version(ver: Optional[str]) -> semver.Version:
         if not ver:
diff --git a/tests/test_feature.py b/tests/test_feature.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from qgis.core import Qgis, QgsVectorLayer
+from qgis.core import QgsVectorLayer
 from qgis.PyQt.QtCore import NULL, QDate, QDateTime, QVariant
 
 from .core.client import Client
@@ -36,24 +36,32 @@ def test_getfeature_gml(client: Client):
     assert "text/xml" in rv.headers.get("Content-Type", ""), rv.headers
     layer = get_test_vector_layer(rv.file("gml"), "GML")
     expected_fields = ["gml_id"]
-    if Qgis.versionInt() >= 33400:
-        expected_fields.extend(["lowerCorner", "upperCorner"])
+    expected_fields.extend(["lowerCorner", "upperCorner"])
     expected_fields.extend(["id", "trailing_zero", "name", "comment", "date_time", "date"])
     assert layer.fields().names() == expected_fields
 
     index = layer.fields().indexFromName("gml_id")
     assert layer.uniqueValues(index) == {"lines.1", "lines.2", "lines.3", "lines.4"}
 
     index = layer.fields().indexFromName("id")
+    assert layer.fields().at(index).type() == QVariant.Int
     assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     index = layer.fields().indexFromName("name")
-    # QGIS 3.24.1 and 3.22.6
     assert layer.uniqueValues(index) == {"éù%@ > 1", "(]~€ > 2", "Line < 3", "Line name"}
 
+
     index = layer.fields().indexFromName("trailing_zero")
-    # field detected as integer, so losing the trailing zero
-    assert layer.uniqueValues(index) == {5200}
+    match layer.fields().at(index).type():
+        case QVariant.Int:
+            # field detected as integer, so losing the trailing zero
+            assert layer.uniqueValues(index) == {5200}
+        case QVariant.String:
+            # In QGIS 4/Gdal 3.10 this is no more interpreted
+            # as integer
+            assert layer.uniqueValues(index) == {"05200"}
+        case unexpected:
+            assert False, f"Unexpected field type: {unexpected}"
 
     # Date time
     index = layer.fields().indexFromName("date_time")
@@ -102,13 +110,19 @@ def test_getfeature_kml(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
-    assert layer.fields().at(index).type() == QVariant.Int
+    match layer.fields().at(index).type():
+        case QVariant.Int:
+            assert layer.uniqueValues(index) == {1, 2, 3, 4}
+        case QVariant.String:
+            # In QGIS 4/Gdal 3.10 the OGR (LIB)KML driver interpret this as string
+            assert layer.uniqueValues(index) == {"1", "2", "3", "4"}
+        case unexpected:
+            assert False, f"Unexpected field type: {unexpected}"
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
 
 def test_getfeature_gpkg(client: Client):
@@ -127,13 +141,13 @@ def test_getfeature_gpkg(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
 
 def test_getfeature_gpx(client: Client):
@@ -208,18 +222,18 @@ def test_getfeature_ods(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
     # Date time
     index = layer.fields().indexFromName("date_time")
-    assert QDateTime(2023, 8, 1, 12, 0) in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.DateTime
+    assert QDateTime(2023, 8, 1, 12, 0) in layer.uniqueValues(index)
 
     # Date
     index = layer.fields().indexFromName("date")
@@ -243,13 +257,13 @@ def test_getfeature_geojson(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
 
 def test_getfeature_excel(client: Client):
@@ -269,13 +283,13 @@ def test_getfeature_excel(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
     # Date time
     index = layer.fields().indexFromName("date_time")
@@ -305,18 +319,18 @@ def test_getfeature_csv(client: Client):
     # ID
     # All fields are loaded as string
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {"1", "2", "3", "4"}
     assert layer.fields().at(index).type() == QVariant.String
+    assert layer.uniqueValues(index) == {"1", "2", "3", "4"}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
     # Date time
     index = layer.fields().indexFromName("date_time")
-    assert "2023/08/01 12:00:00" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "2023/08/01 12:00:00" in layer.uniqueValues(index)
 
     # Date
     index = layer.fields().indexFromName("date")
@@ -340,13 +354,13 @@ def test_getfeature_shapefile(client: Client):
     )
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.LongLong  # Int to LongLong compare to others
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_z")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
 
 def test_getfeature_tab(client: Client):
@@ -365,13 +379,13 @@ def test_getfeature_tab(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
 
 def test_getfeature_mif(client: Client):
@@ -390,13 +404,13 @@ def test_getfeature_mif(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
 
 def test_getfeature_layer_name_with_accent(client: Client):
@@ -433,13 +447,13 @@ def test_getfeature_geojson_with_selection(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
 
 def test_getfeature_fgb(client: Client):
@@ -458,20 +472,20 @@ def test_getfeature_fgb(client: Client):
 
     # ID
     index = layer.fields().indexFromName("id")
-    assert layer.uniqueValues(index) == {1, 2, 3, 4}
     assert layer.fields().at(index).type() == QVariant.Int
+    assert layer.uniqueValues(index) == {1, 2, 3, 4}
 
     # Trailing 0
     index = layer.fields().indexFromName("trailing_zero")
-    assert "05200" in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.String
+    assert "05200" in layer.uniqueValues(index)
 
     # Date time
     index = layer.fields().indexFromName("date_time")
-    assert QDateTime(2023, 8, 1, 12, 0) in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.DateTime
+    assert QDateTime(2023, 8, 1, 12, 0) in layer.uniqueValues(index)
 
     # Date
     index = layer.fields().indexFromName("date")
-    assert QDateTime(2023, 8, 1, 0, 0) in layer.uniqueValues(index)
     assert layer.fields().at(index).type() == QVariant.DateTime
+    assert QDateTime(2023, 8, 1, 0, 0) in layer.uniqueValues(index)

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ jobs:`
`38`	`38`	`"3.34",`
`39`	`39`	`"3.40",`
`40`	`40`	`"3.44",`
`41`		`- "nightly-release",`
	`41`	`+ "4.0",`
`42`	`42`	`]`
`43`	`43`	`steps:`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ qgis-tests:`
`41`	`41`	`"3.34",`
`42`	`42`	`"3.40",`
`43`	`43`	`"3.44",`
	`44`	`+ "4.0",`
`44`	`45`	`]`
`45`	`46`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ authors = [`
`4`	`4`	`{ name = "3liz", email = "info@3liz.com" }`
`5`	`5`	`]`
`6`	`6`	`version = "1.8.4"`
`7`		`-requires-python = ">=3.10"`
	`7`	`+requires-python = ">=3.9"`
`8`	`8`	`license = "GPL-2.0-only"`
`9`	`9`	`license-files = ["LICENSE"]`
`10`	`10`	`readme = "README.md"`