From 0ed60d29cb2619a9ece32444e31d7fdbd81affd3 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 26 Nov 2022 16:40:20 +0100 Subject: [PATCH 1/1] remove NOMINATIM_NOMINATIM_TOOL variable This was used by the old PHP scripts to call the Python tool. With the scripts now gone, the variable can be removed. --- cmake/tool-installed.tmpl | 2 -- cmake/tool.tmpl | 2 -- test/bdd/steps/nominatim_environment.py | 1 - 3 files changed, 5 deletions(-) diff --git a/cmake/tool-installed.tmpl b/cmake/tool-installed.tmpl index 8825daaf..d1c453fa 100644 --- a/cmake/tool-installed.tmpl +++ b/cmake/tool-installed.tmpl @@ -4,8 +4,6 @@ import os sys.path.insert(1, '@NOMINATIM_LIBDIR@/lib-python') -os.environ['NOMINATIM_NOMINATIM_TOOL'] = os.path.abspath(__file__) - from nominatim import cli from nominatim import version diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl index c1ecd3f0..b76d2e0a 100755 --- a/cmake/tool.tmpl +++ b/cmake/tool.tmpl @@ -4,8 +4,6 @@ import os sys.path.insert(1, '@CMAKE_SOURCE_DIR@') -os.environ['NOMINATIM_NOMINATIM_TOOL'] = os.path.abspath(__file__) - from nominatim import cli from nominatim import version diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py index 5145327c..1e7515d6 100644 --- a/test/bdd/steps/nominatim_environment.py +++ b/test/bdd/steps/nominatim_environment.py @@ -105,7 +105,6 @@ class NominatimEnvironment: self.test_env['NOMINATIM_CONFIGDIR'] = str((self.src_dir / 'settings').resolve()) self.test_env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = str((self.build_dir / 'module').resolve()) self.test_env['NOMINATIM_OSM2PGSQL_BINARY'] = str((self.build_dir / 'osm2pgsql' / 'osm2pgsql').resolve()) - self.test_env['NOMINATIM_NOMINATIM_TOOL'] = str((self.build_dir / 'nominatim').resolve()) if self.tokenizer is not None: self.test_env['NOMINATIM_TOKENIZER'] = self.tokenizer if self.import_style is not None: -- 2.39.5