Skip to content

Commit

Permalink
Drop QGIS 3.10 and 3.16 from compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustry committed Oct 1, 2024
1 parent e5fb4b6 commit e7cddba
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 43 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
strategy:
matrix:
qgis_version: [
"3.16",
"3.22",
"3.28",
"3.34",
Expand Down
1 change: 0 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ qgis-server-legacy:
parallel:
matrix:
- QGIS_VERSION: [
"3.16",
"3.22",
]
script:
Expand Down
2 changes: 1 addition & 1 deletion lizmap_server/metadata.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[general]
name=Lizmap server
qgisMinimumVersion=3.10
qgisMinimumVersion=3.22
qgisMaximumVersion=3.99
author=3Liz
[email protected]
Expand Down
2 changes: 1 addition & 1 deletion lizmap_server/server_info_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down
28 changes: 12 additions & 16 deletions test/test_get_feature_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
23 changes: 1 addition & 22 deletions test/test_legend.py
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
{
Expand Down
2 changes: 1 addition & 1 deletion test/test_server_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e7cddba

Please sign in to comment.