Raise to QGIS 3.22 and PG 14

.docker/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     profiles:
       - "qgis"
       - "db"
-    image: kartoza/postgis:11.5-2.5  # Despite the tag, it's a 11.7 version
+    image: kartoza/postgis:14-3.3
     container_name: postgis
     networks:
       qgis_plugin_network:
@@ -30,7 +30,7 @@ services:
   qgis:
     profiles:
       - "qgis"
-    image: qgis/qgis:release-3_16
+    image: qgis/qgis:release-3_22
     container_name: qgis
     networks:
       qgis_plugin_network:

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Raise to QGIS 3.22 minimum version
+* Upgrade to PostgreSQL 14 for testing
+
 ## 1.3.0 - 2024-02-05
 
 * Additional glossary terms for publication frequency and link types (contribution from @effjot Florian Jenn)

pg_metadata/locator.py

@@ -5,6 +5,7 @@
 from qgis.core import (
     Qgis,
     QgsDataSourceUri,
+    QgsIconUtils,
     QgsLocatorFilter,
     QgsLocatorResult,
     QgsProject,
@@ -13,6 +14,7 @@
     QgsRasterLayer,
     QgsSettings,
     QgsVectorLayer,
+    QgsWkbTypes,
 )
 from qgis.PyQt.QtCore import QLocale
 from qgis.PyQt.QtWidgets import QDockWidget
@@ -22,7 +24,6 @@
     connections_list,
 )
 from pg_metadata.qgis_plugin_tools.tools.i18n import tr
-from pg_metadata.tools import icon_for_geometry_type
 
 SCHEMA = 'pgmetadata'
 
@@ -98,7 +99,7 @@ def fetch_result_single_database(self, search: str, connection_name: str):
             result = QgsLocatorResult()
             result.filter = self
             result.displayString = item[0]
-            result.icon = icon_for_geometry_type(item[3])
+            result.icon = QgsIconUtils.iconForWkbType(QgsWkbTypes.parseType(item[3]))
             result.userData = {
                 'name': item[4],
                 'connection': connection_name,

pg_metadata/metadata.txt

@@ -1,6 +1,6 @@
 [general]
 name=PgMetadata
-qgisMinimumVersion=3.16
+qgisMinimumVersion=3.22
 description=Store some metadata about layers which are stored in PostgreSQL. It's possible to define title, abstract, links, contacts etc. It also provides some search tool, in the QGIS Locator bar for instance.
 author=3Liz
 [email protected]

pg_metadata/test/test_resources.py

@@ -16,7 +16,7 @@ class TestResources(unittest.TestCase):
 
     def test_qgis_version(self):
         """ Test QGIS versions are correct in metadata and provided QGIS version. """
-        expected_qgis_version = "3.16"
+        expected_qgis_version = "3.22"
 
         # Test the QGIS project
         qgis_project = resources_path('projects', 'pg_metadata_administration.qgs')