mypy: minimal annotations to enable a clean run

diff --git a/.mypy.ini b/.mypy.ini
new file mode 100644 (file)
index 0000000..28b8199
--- /dev/null
+++ b/.mypy.ini
@@ -0,0 +1,16 @@
+[mypy]
+
+[mypy-icu.*]
+ignore_missing_imports = True
+
+[mypy-psycopg2.*]
+ignore_missing_imports = True
+
+[mypy-psutil]
+ignore_missing_imports = True
+
+[mypy-osmium.*]
+ignore_missing_imports = True
+
+[mypy-datrie.*]
+ignore_missing_imports = True

diff --git a/nominatim/config.py b/nominatim/config.py
index b3934b491fa9a36a690526d1b1c55be4b524804d..2049b6a6bc676e09bf91cefb85730a1270f01419 100644 (file)
--- a/nominatim/config.py
+++ b/nominatim/config.py
@@ -7,6 +7,7 @@
 """
 Nominatim configuration accessor.
 """
 """
 Nominatim configuration accessor.
 """

+from typing import Dict, Any

 import logging
 import os
 from pathlib import Path
 import logging
 import os
 from pathlib import Path


@@ -18,7 +19,7 @@ from dotenv import dotenv_values
 from nominatim.errors import UsageError
 
 LOG = logging.getLogger()
 from nominatim.errors import UsageError
 
 LOG = logging.getLogger()

-CONFIG_CACHE = {}
+CONFIG_CACHE : Dict[str, Any] = {}

 
 def flatten_config_list(content, section=''):
     """ Flatten YAML configuration lists that contain include sections
 
 def flatten_config_list(content, section=''):
     """ Flatten YAML configuration lists that contain include sections

diff --git a/nominatim/tools/migration.py b/nominatim/tools/migration.py
index 28a14455066f689fad6b93a05a78ddd8c0014fe0..8cb1a35524bdbb0c11a42aba80415a2c00e55255 100644 (file)
--- a/nominatim/tools/migration.py
+++ b/nominatim/tools/migration.py
@@ -7,6 +7,7 @@
 """
 Functions for database migration to newer software versions.
 """
 """
 Functions for database migration to newer software versions.
 """

+from typing import List, Tuple, Callable

 import logging
 
 from psycopg2 import sql as pysql
 import logging
 
 from psycopg2 import sql as pysql


@@ -20,7 +21,7 @@ from nominatim.errors import UsageError
 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 

-_MIGRATION_FUNCTIONS = []
+_MIGRATION_FUNCTIONS : List[Tuple[str, Callable]] = []

 
 def migrate(config, paths):
     """ Check for the current database version and execute migrations,
 
 def migrate(config, paths):
     """ Check for the current database version and execute migrations,

diff --git a/nominatim/tools/replication.py b/nominatim/tools/replication.py
index 53571706472036f80b546846f23b43fc905ec6c6..fab3d2db57dc54822d4178261718a17ca132024e 100644 (file)
--- a/nominatim/tools/replication.py
+++ b/nominatim/tools/replication.py
@@ -21,8 +21,8 @@ try:
     from osmium.replication.server import ReplicationServer
     from osmium import WriteHandler
 except ImportError as exc:
     from osmium.replication.server import ReplicationServer
     from osmium import WriteHandler
 except ImportError as exc:

-    logging.getLogger().fatal("pyosmium not installed. Replication functions not available.\n"
-                              "To install pyosmium via pip: pip3 install osmium")
+    logging.getLogger().critical("pyosmium not installed. Replication functions not available.\n"
+                                 "To install pyosmium via pip: pip3 install osmium")

     raise UsageError("replication tools not available") from exc
 
 LOG = logging.getLogger()
     raise UsageError("replication tools not available") from exc
 
 LOG = logging.getLogger()

diff --git a/nominatim/tools/special_phrases/sp_importer.py b/nominatim/tools/special_phrases/sp_importer.py
index 31bbc3551cfed82a086feb25953ea073d0a4c011..805f8937875beb4dda7d5063b33d6d1c39605d6c 100644 (file)
--- a/nominatim/tools/special_phrases/sp_importer.py
+++ b/nominatim/tools/special_phrases/sp_importer.py
@@ -33,7 +33,7 @@ class SPImporter():
 
         Take a sp loader which load the phrases from an external source.
     """
 
         Take a sp loader which load the phrases from an external source.
     """

-    def __init__(self, config, db_connection, sp_loader) -> None:
+    def __init__(self, config, db_connection, sp_loader):

         self.config = config
         self.db_connection = db_connection
         self.sp_loader = sp_loader
         self.config = config
         self.db_connection = db_connection
         self.sp_loader = sp_loader