Skip to content

Commit

Permalink
Bump QGIS minimum version to 3.22
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustry committed May 27, 2024
1 parent d59358b commit be06e8a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ jobs:
strategy:
matrix:
qgis_version: [
"3.16",
"3.22",
"3.28",
"3.34",
"nightly-release",
]

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

* Bump QGIS minimum version to QGIS 3.22

## 3.3.2 - 2022-10-19

* Fix an issue when the layout does not have a map, fix #59 (contribution from @benoitblanc)
Expand Down
2 changes: 1 addition & 1 deletion atlasprint/metadata.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[general]
name=atlasprint
qgisMinimumVersion=3.10
qgisMinimumVersion=3.22
description=Add atlas capabilities for getPrint request in WMS for QGIS Server
author=3Liz
[email protected]
Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ifdef REGISTRY_URL
endif

# Qgis version flavor
FLAVOR:=3.16
FLAVOR:=3.22

BECOME_USER:=$(shell id -u)

Expand Down
10 changes: 2 additions & 8 deletions tests/test_getprintatlas.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ def test_invalid_exp_filter(client):
assert rv.headers.get('Content-Type', '').find('application/json') == 0
b = json.loads(rv.content.decode('utf-8'))
assert b['status'] == 'fail'
if Qgis.QGIS_VERSION_INT >= 32200:
expected = 'unexpected end of file'
else:
expected = 'unexpected $end'
expected = 'unexpected end of file'
assert b['message'] == (
'ATLAS - Error from the user while generating the PDF: Expression is invalid: \n'
'syntax error, {}, expecting COMMA or \')\''.format(expected))
Expand All @@ -75,10 +72,7 @@ def test_invalid_exp_filter_field(client):
assert rv.headers.get('Content-Type', '').find('application/json') == 0
b = json.loads(rv.content.decode('utf-8'))
assert b['status'] == 'fail'
if Qgis.QGIS_VERSION_INT < 31600:
field = 'Column'
else:
field = 'Field'
field = 'Field'
assert b['message'] == (
'ATLAS - Error from the user while generating the PDF: Expression is invalid, eval error: '
'{} \'fakeId\' not found'.format(field))
Expand Down

0 comments on commit be06e8a

Please sign in to comment.