remove code for setting osm2pgsql via config.lib_dir

With the internal osm2pgsql gone, configuration of the binary location
via settings is the only option left that makes sense.
This commit is contained in:
Sarah Hoffmann
2025-03-11 08:45:10 +01:00
parent cd08956c61
commit f5755a7a82
12 changed files with 33 additions and 36 deletions

View File

@@ -16,8 +16,7 @@ import nominatim_db.cli
def run_export(tmp_path, capsys):
def _exec(args):
cli_args = ['export', '--project-dir', str(tmp_path)] + args
assert 0 == nominatim_db.cli.nominatim(osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
cli_args=cli_args)
assert 0 == nominatim_db.cli.nominatim(cli_args=cli_args)
return capsys.readouterr().out.split('\r\n')
return _exec

View File

@@ -29,6 +29,5 @@ def setup_database_with_context(apiobj, table_factory):
@pytest.mark.parametrize('args', [['--search-only'], ['--reverse-only']])
def test_warm_all(tmp_path, args):
assert 0 == nominatim_db.cli.nominatim(osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
cli_args=['admin', '--project-dir', str(tmp_path),
assert 0 == nominatim_db.cli.nominatim(cli_args=['admin', '--project-dir', str(tmp_path),
'--warm'] + args)