diff --git a/Makefile b/Makefile index 8fb02389..7217486c 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,9 @@ tests: .PHONY: test -install-tests: +install-tests: install-dev + +install-dev: pip install -U --upgrade-strategy=eager -r requirements/dev.txt export QGIS_SERVER_LIZMAP_REVEAL_SETTINGS=TRUE diff --git a/lizmap_server/context/qjazz.py b/lizmap_server/context/qjazz.py index 6e6985fd..f2ca72d7 100644 --- a/lizmap_server/context/qjazz.py +++ b/lizmap_server/context/qjazz.py @@ -106,9 +106,16 @@ def metadata(self) -> ServerMetadata: """ Return server metadata """ from importlib import metadata + from qjazz_contrib.core import manifest + + commit = manifest.get_manifest().commit_id + if commit: + commit = commit[:12] + version = metadata.version('qjazz_cache') return ServerMetadata( name=SERVER_CONTEXT_NAME, + commit_id=commit, version=version, is_stable=not any(x in version for x in ("pre", "alpha", "beta", "rc", "dev")), ) diff --git a/lizmap_server/expression_service.py b/lizmap_server/expression_service.py index 7060a8a5..6b2c5add 100755 --- a/lizmap_server/expression_service.py +++ b/lizmap_server/expression_service.py @@ -910,7 +910,7 @@ def virtualFields(params: Dict[str, str], response: QgsServerResponse, project: req_sorting_field = params.get('SORTING_FIELD', '') order_by_clause = QgsFeatureRequest.OrderByClause(req_sorting_field, req_sorting_order_param == 'asc') req.setOrderBy(QgsFeatureRequest.OrderBy([order_by_clause])) - elif req_sorting_order_param != '' : + elif req_sorting_order_param != '': raise ExpressionServiceError( "Bad request error", f"Invalid SORTING_ORDER for 'VirtualFields': \"{req_sorting_order_param}\"", diff --git a/pyproject.toml b/pyproject.toml index 9199be9f..31f53434 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,8 +25,6 @@ extend-select = [ "RUF", ] ignore = [ - "ANN101", - "ANN102", "ANN002", "ANN003", "RUF100", diff --git a/test/test_expression_service_virtualfields.py b/test/test_expression_service_virtualfields.py index 7a971144..f5a7c5a2 100644 --- a/test/test_expression_service_virtualfields.py +++ b/test/test_expression_service_virtualfields.py @@ -206,6 +206,7 @@ def test_request_with_filter_fields_geometry(client): assert 'b' in b['features'][0]['properties'] assert b['features'][0]['properties']['b'] == 2 + def test_request_limit(client): """ Test Expression VirtualFields request """