"""
env = get_pg_env(options['dsn'])
- osm2pgsql_cmd = options['osm2pgsql']
- if osm2pgsql_cmd is None:
- osm2pgsql_cmd = shutil.which('osm2pgsql')
- if osm2pgsql_cmd is None:
- raise RuntimeError('osm2pgsql executable not found. Please install osm2pgsql first.')
-
- cmd = [str(osm2pgsql_cmd),
+ cmd = [_find_osm2pgsql_cmd(options['osm2pgsql']),
'--slim',
'--log-progress', 'true',
'--number-processes', '1' if options['append'] else str(options['threads']),
subprocess.run(cmd, cwd=options.get('cwd', '.'),
input=options.get('import_data'),
env=env, check=True)
+
+
+def _find_osm2pgsql_cmd(cmdline: str) -> str:
+ if cmdline is not None:
+ return cmdline
+
+ in_path = shutil.which('osm2pgsql')
+ if in_path is None:
+ raise RuntimeError('osm2pgsql executable not found. Please install osm2pgsql first.')
+
+ return str(in_path)
lambda *args, **kwargs: calls.append('import') or 0)
monkeypatch.setattr(nominatim_db.tools.refresh, 'recompute_importance',
lambda *args, **kwargs: calls.append('update'))
- func_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions')
+ func_mock = mock_func_factory(nominatim_db.tools.refresh, 'create_functions')
assert self.call_nominatim('refresh', '--importance', '--wiki-data') == 0
import pytest
-from nominatim.tools.refresh import import_wikipedia_articles, recompute_importance, create_functions
+from nominatim_db.tools.refresh import import_wikipedia_articles, recompute_importance, create_functions
@pytest.fixture
def wiki_csv(tmp_path, sql_preprocessor):