hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

import requests library later than osmium

Browse Source 
requests will usually be pulled in by osmium and is therefore not
a direct dependency of nominatim. Make sure it is only used, when
osmium is present.
This commit is contained in:
Sarah Hoffmann
2024-08-19 16:36:09 +02:00
parent 968f1cd453
commit fd9437277e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nominatim_db/tools/replication.py
View File

@@ -16,8 +16,6 @@ import time
import types import types
import urllib.request as urlrequest import urllib.request as urlrequest
import requests
from ..errors import UsageError from ..errors import UsageError
from ..db import status from ..db import status
from ..db.connection import Connection, connect, server_version_tuple from ..db.connection import Connection, connect, server_version_tuple
@@ -27,9 +25,10 @@ try:
from osmium.replication.server import ReplicationServer from osmium.replication.server import ReplicationServer
from osmium import WriteHandler from osmium import WriteHandler
from osmium import version as pyo_version from osmium import version as pyo_version
except ImportError as exc: import requests
except ModuleNotFoundError as exc:
logging.getLogger().critical("pyosmium not installed. Replication functions not available.\n" logging.getLogger().critical("pyosmium not installed. Replication functions not available.\n"
"To install pyosmium via pip: pip3 install osmium") "To install pyosmium via pip: pip install osmium")
raise UsageError("replication tools not available") from exc raise UsageError("replication tools not available") from exc
LOG = logging.getLogger() LOG = logging.getLogger()