fix linting issues

diff --git a/Makefile b/Makefile
index 03ddafac4a003f6a3f3c338930e3a181ce40325a..1575b72a5d5d273ee3f31cc969d11f2d52fe8bd2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,13 @@ build-api:
 tests: mypy lint pytest
 
 mypy:
 tests: mypy lint pytest
 
 mypy:

-       python3 -m mypy --strict src
+       mypy --strict src

 
 pytest:
 
 pytest:

-       python3 -m pytest test/python
+       pytest test/python

 
 lint:
 
 lint:

-       python3 -m pylint src
+       pylint src

 
 bdd:
        cd test/bdd; behave -DREMOVE_TEMPLATE=1
 
 bdd:
        cd test/bdd; behave -DREMOVE_TEMPLATE=1

diff --git a/src/nominatim_api/search/db_search_fields.py b/src/nominatim_api/search/db_search_fields.py
index df2b32a77a9d61afeb12d1df3b238163c129c0e2..8f674ecc9f35420d3aa15f9c6a48085b0ab78b05 100644 (file)
--- a/src/nominatim_api/search/db_search_fields.py
+++ b/src/nominatim_api/search/db_search_fields.py
@@ -13,9 +13,9 @@ import dataclasses
 import sqlalchemy as sa
 
 from nominatim_core.typing import SaFromClause, SaColumn, SaExpression
 import sqlalchemy as sa
 
 from nominatim_core.typing import SaFromClause, SaColumn, SaExpression

+from nominatim_core.utils.json_writer import JsonWriter

 from .query import Token
 from . import db_search_lookups as lookups
 from .query import Token
 from . import db_search_lookups as lookups

-from nominatim_core.utils.json_writer import JsonWriter

 
 
 @dataclasses.dataclass
 
 
 @dataclasses.dataclass

diff --git a/src/nominatim_api/status.py b/src/nominatim_api/status.py
index ec6ce5d653fdcd043f5ea27712ee709864076583..614789ed4ec568e4f0b8b4511ec62f2e97435d55 100644 (file)
--- a/src/nominatim_api/status.py
+++ b/src/nominatim_api/status.py
@@ -14,7 +14,7 @@ import dataclasses
 import sqlalchemy as sa
 
 from .connection import SearchConnection
 import sqlalchemy as sa
 
 from .connection import SearchConnection

-from .version import NOMINATIM_API_VERSION, parse_version
+from .version import NOMINATIM_API_VERSION, NominatimVersion, parse_version

 
 @dataclasses.dataclass
 class StatusResult:
 
 @dataclasses.dataclass
 class StatusResult:


@@ -24,7 +24,7 @@ class StatusResult:
     message: str
     software_version = NOMINATIM_API_VERSION
     data_updated: Optional[dt.datetime] = None
     message: str
     software_version = NOMINATIM_API_VERSION
     data_updated: Optional[dt.datetime] = None

-    database_version: Optional[str] = None
+    database_version: Optional[NominatimVersion] = None

 
 
 async def get_status(conn: SearchConnection) -> StatusResult:
 
 
 async def get_status(conn: SearchConnection) -> StatusResult:

diff --git a/src/nominatim_api/version.py b/src/nominatim_api/version.py
index 5d932fc9ec760680e0465a07811be47dc14e0017..5dd084c7f8f1913426b7cfe3bd221f50f14c2c32 100644 (file)
--- a/src/nominatim_api/version.py
+++ b/src/nominatim_api/version.py
@@ -8,6 +8,10 @@
 Version information for the Nominatim API.
 """
 
 Version information for the Nominatim API.
 """
 

-from nominatim_core.version import NominatimVersion, parse_version
+# See also https://github.com/PyCQA/pylint/issues/6006
+# pylint: disable=useless-import-alias,unused-import
+
+from nominatim_core.version import (NominatimVersion as NominatimVersion,
+                                    parse_version as parse_version)

 
 NOMINATIM_API_VERSION = '4.4.99'
 
 NOMINATIM_API_VERSION = '4.4.99'

diff --git a/src/nominatim_db/clicmd/api.py b/src/nominatim_db/clicmd/api.py
index 0f0d1ebd987a27f6a0bb445147978ceb95e2d1a5..25b4bff35a33d7f8e7c294f9ba1491e23ef5f8cc 100644 (file)
--- a/src/nominatim_db/clicmd/api.py
+++ b/src/nominatim_db/clicmd/api.py
@@ -12,7 +12,9 @@ import argparse
 import logging
 import json
 import sys
 import logging
 import json
 import sys

+from functools import reduce

 
 

+from nominatim_core.errors import UsageError

 import nominatim_api as napi
 import nominatim_api.v1 as api_output
 from nominatim_api.v1.helpers import zoom_to_rank, deduplicate_results
 import nominatim_api as napi
 import nominatim_api.v1 as api_output
 from nominatim_api.v1.helpers import zoom_to_rank, deduplicate_results


@@ -61,7 +63,7 @@ def _add_api_output_arguments(parser: argparse.ArgumentParser) -> None:
                              "Parameter is difference tolerance in degrees."))
 
 
                              "Parameter is difference tolerance in degrees."))
 
 

-def _get_geometry_output(args) -> napi.GeometryFormat:
+def _get_geometry_output(args: NominatimArgs) -> napi.GeometryFormat:

     """ Get the requested geometry output format in a API-compatible
         format.
     """
     """ Get the requested geometry output format in a API-compatible
         format.
     """


@@ -82,7 +84,7 @@ def _get_geometry_output(args) -> napi.GeometryFormat:
         raise UsageError(f"Unknown polygon output format '{args.polygon_output}'.") from exp
 
 
         raise UsageError(f"Unknown polygon output format '{args.polygon_output}'.") from exp
 
 

-def _get_locales(args, default: Optional[str]) -> napi.Locales:
+def _get_locales(args: NominatimArgs, default: Optional[str]) -> napi.Locales:

     """ Get the locales from the language parameter.
     """
     if args.lang:
     """ Get the locales from the language parameter.
     """
     if args.lang:


@@ -93,7 +95,7 @@ def _get_locales(args, default: Optional[str]) -> napi.Locales:
     return napi.Locales()
 
 
     return napi.Locales()
 
 

-def _get_layers(args, default: napi.DataLayer) -> Optional[napi.DataLayer]:
+def _get_layers(args: NominatimArgs, default: napi.DataLayer) -> Optional[napi.DataLayer]:

     """ Get the list of selected layers as a DataLayer enum.
     """
     if not args.layers:
     """ Get the list of selected layers as a DataLayer enum.
     """
     if not args.layers:

diff --git a/src/nominatim_db/clicmd/args.py b/src/nominatim_db/clicmd/args.py
index aa95dbb99402f7ec730a02e555178abbb94eb1a4..857cb55efbf197b2523e243c9876e1027d9888ec 100644 (file)
--- a/src/nominatim_db/clicmd/args.py
+++ b/src/nominatim_db/clicmd/args.py
@@ -10,7 +10,6 @@ Provides custom functions over command-line arguments.
 from typing import Optional, List, Dict, Any, Sequence, Tuple
 import argparse
 import logging
 from typing import Optional, List, Dict, Any, Sequence, Tuple
 import argparse
 import logging

-from functools import reduce

 from pathlib import Path
 
 from nominatim_core.errors import UsageError
 from pathlib import Path
 
 from nominatim_core.errors import UsageError

diff --git a/src/nominatim_db/version.py b/src/nominatim_db/version.py
index 82ae17e9ee4e0ba59c0617e0616b2bafbf391bbe..525a0d99ea0ccf3cdd71a6c35e13da055c5b5c57 100644 (file)
--- a/src/nominatim_db/version.py
+++ b/src/nominatim_db/version.py
@@ -9,7 +9,11 @@ Version information for Nominatim.
 """
 from typing import Optional
 
 """
 from typing import Optional
 

-from nominatim_core.version import NominatimVersion, parse_version
+# See also https://github.com/PyCQA/pylint/issues/6006
+# pylint: disable=useless-import-alias,unused-import
+
+from nominatim_core.version import (NominatimVersion as NominatimVersion,
+                                    parse_version as parse_version)

 
 NOMINATIM_VERSION = NominatimVersion(4, 4, 99, 1)
 
 
 NOMINATIM_VERSION = NominatimVersion(4, 4, 99, 1)