X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0fb4fe8e4df63fd09704ca0752ed4248dab11ecd:/nominatim/config.py..6e89310a9285f1ad15d8002bf68f578eada367a0:/src/nominatim_core/config.py diff --git a/nominatim/config.py b/src/nominatim_core/config.py similarity index 97% rename from nominatim/config.py rename to src/nominatim_core/config.py index 6bfc6076..5393b543 100644 --- a/nominatim/config.py +++ b/src/nominatim_core/config.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # @@ -19,9 +19,9 @@ import yaml from dotenv import dotenv_values from psycopg2.extensions import parse_dsn -from nominatim.typing import StrPath -from nominatim.errors import UsageError -import nominatim.paths +from .typing import StrPath +from .errors import UsageError +from . import paths LOG = logging.getLogger() CONFIG_CACHE : Dict[str, Any] = {} @@ -62,7 +62,7 @@ class Configuration: environ: Optional[Mapping[str, str]] = None) -> None: self.environ = environ or os.environ self.project_dir = project_dir - self.config_dir = nominatim.paths.CONFIG_DIR + self.config_dir = paths.CONFIG_DIR self._config = dotenv_values(str(self.config_dir / 'env.defaults')) if self.project_dir is not None and (self.project_dir / '.env').is_file(): self.project_dir = self.project_dir.resolve() @@ -71,9 +71,9 @@ class Configuration: class _LibDirs: module: Path osm2pgsql: Path - php = nominatim.paths.PHPLIB_DIR - sql = nominatim.paths.SQLLIB_DIR - data = nominatim.paths.DATA_DIR + php = paths.PHPLIB_DIR + sql = paths.SQLLIB_DIR + data = paths.DATA_DIR self.lib_dir = _LibDirs() self._private_plugins: Dict[str, object] = {}