From e7cddba305dabb555bf399c388f2616b37d70902 Mon Sep 17 00:00:00 2001
From: Etienne Trimaille <gustrimaille@yahoo.fr>
Date: Tue, 1 Oct 2024 16:00:32 +0200
Subject: [PATCH] Drop QGIS 3.10 and 3.16 from compatibility

---
 .github/workflows/ci.yml             |  1 -
 .gitlab-ci.yml                       |  1 -
 lizmap_server/metadata.txt           |  2 +-
 lizmap_server/server_info_handler.py |  2 +-
 test/test_get_feature_info.py        | 28 ++++++++++++----------------
 test/test_legend.py                  | 23 +----------------------
 test/test_server_info.py             |  2 +-
 7 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f16c6b29..f64258bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,6 @@ jobs:
     strategy:
       matrix:
         qgis_version: [
-          "3.16",
           "3.22",
           "3.28",
           "3.34",
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0eac3998..df9d7cab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,6 @@ qgis-server-legacy:
   parallel:
     matrix:
       - QGIS_VERSION: [
-        "3.16",
         "3.22",
       ]
   script:
diff --git a/lizmap_server/metadata.txt b/lizmap_server/metadata.txt
index 1287e44a..2263d4a0 100755
--- a/lizmap_server/metadata.txt
+++ b/lizmap_server/metadata.txt
@@ -1,6 +1,6 @@
 [general]
 name=Lizmap server
-qgisMinimumVersion=3.10
+qgisMinimumVersion=3.22
 qgisMaximumVersion=3.99
 author=3Liz
 email=info@3liz.com
diff --git a/lizmap_server/server_info_handler.py b/lizmap_server/server_info_handler.py
index 2af1e064..61faa2f2 100755
--- a/lizmap_server/server_info_handler.py
+++ b/lizmap_server/server_info_handler.py
@@ -120,7 +120,7 @@ def _handleRequest(self, context):
             if context.serverInterface().serviceRegistry().getService(service):
                 services_available.append(service)
 
-        if Qgis.QGIS_VERSION_INT >= 31200 and Qgis.devVersion() != 'exported':
+        if Qgis.devVersion() != 'exported':
             commit_id = Qgis.devVersion()
         else:
             commit_id = ''
diff --git a/test/test_get_feature_info.py b/test/test_get_feature_info.py
index e21e32c8..7286377d 100644
--- a/test/test_get_feature_info.py
+++ b/test/test_get_feature_info.py
@@ -213,7 +213,6 @@ def test_single_get_feature_info_form_shortname_popup(client):
     assert '<div class="container popup_lizmap_dd" style="width:100%;">' in map_tip
 
 
-# @pytest.mark.skipif(Qgis.QGIS_VERSION_INT >= 32200, reason="Only QGIS 3.22 minimum")
 def test_single_get_feature_info_ascii(client):
     """ Test the Get Feature Info with different filters. """
     qs = {
@@ -242,20 +241,17 @@ def test_single_get_feature_info_ascii(client):
     rv = client.get(_build_query_string(qs, use_urllib=True), PROJECT)
     data = _check_request(rv)
 
-    if Qgis.QGIS_VERSION_INT <= 31700:
-        expected = {'features': [], 'type': 'FeatureCollection'}
-    else:
-        expected = {
-            'features': [
-                {
-                    'geometry': None,
-                    'id': 'accents.3',
-                    'properties': {
-                        'NAME_1': "Bret'agne",
-                    },
-                    'type': 'Feature',
+    expected = {
+        'features': [
+            {
+                'geometry': None,
+                'id': 'accents.3',
+                'properties': {
+                    'NAME_1': "Bret'agne",
                 },
-            ],
-            'type': 'FeatureCollection',
-        }
+                'type': 'Feature',
+            },
+        ],
+        'type': 'FeatureCollection',
+    }
     assert expected == data, data
diff --git a/test/test_legend.py b/test/test_legend.py
index 56ac58d6..e8d2a9d4 100644
--- a/test/test_legend.py
+++ b/test/test_legend.py
@@ -175,28 +175,7 @@ def test_valid_raster_layer(client):
     b = _check_request(rv)
 
     # Answer straight from QGIS Server
-    if Qgis.QGIS_VERSION_INT < 32200:
-        expected = {
-            'nodes': [
-                {
-                    'symbols': [
-                        {
-                            # 'icon': '',
-                            'title': '50',
-                        }, {
-                            # 'icon': '',
-                            'title': '125',
-                        },
-                    ],
-                    'title': qs['LAYER'],
-                    'type': 'layer',
-                },
-            ],
-            'title': '',
-        }
-        del b['nodes'][0]['symbols'][0]['icon']
-        del b['nodes'][0]['symbols'][1]['icon']
-    elif 32200 <= Qgis.QGIS_VERSION_INT < 33400:
+    if Qgis.QGIS_VERSION_INT < 33400:
         expected = {
             'nodes': [
                 {
diff --git a/test/test_server_info.py b/test/test_server_info.py
index 91c5dd02..daf6aecc 100644
--- a/test/test_server_info.py
+++ b/test/test_server_info.py
@@ -45,7 +45,7 @@ def test_lizmap_server_info(client):
 
     if 33000 <= Qgis.QGIS_VERSION_INT < 33200:
         assert json_content['qgis_server']['metadata']['name'] == "'s-Hertogenbosch"
-    elif 32800 <= Qgis.QGIS_VERSION_INT < 32800:
+    elif 32800 <= Qgis.QGIS_VERSION_INT < 32900:
         assert json_content['qgis_server']['metadata']['name'] == "Firenze"
 
     # Names and versions are used in Lizmap Web Client