diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5670fd4..3efe322 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,8 +15,9 @@ jobs: strategy: matrix: qgis_version: [ - "3.16", "3.22", + "3.28", + "3.34", "nightly-release", ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4aa26..8686095 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/atlasprint/metadata.txt b/atlasprint/metadata.txt index a038844..66635f3 100755 --- a/atlasprint/metadata.txt +++ b/atlasprint/metadata.txt @@ -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=info@3liz.com diff --git a/tests/Makefile b/tests/Makefile index 3ef2229..8ecad71 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -10,7 +10,7 @@ ifdef REGISTRY_URL endif # Qgis version flavor -FLAVOR:=3.16 +FLAVOR:=3.22 BECOME_USER:=$(shell id -u) diff --git a/tests/test_getprintatlas.py b/tests/test_getprintatlas.py index ee3f17c..a000ec2 100644 --- a/tests/test_getprintatlas.py +++ b/tests/test_getprintatlas.py @@ -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)) @@ -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))