From 30dac2a1f0cbaf479ba03cb7ffd199d7fa4c5763 Mon Sep 17 00:00:00 2001 From: Herman Snevajs Date: Fri, 3 Jul 2026 17:05:56 +0200 Subject: [PATCH] Add deps/ unconditionally --- mergin/common.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/mergin/common.py b/mergin/common.py index f7b3d37..3d3f7e8 100644 --- a/mergin/common.py +++ b/mergin/common.py @@ -114,20 +114,18 @@ class InvalidProject(Exception): pass -try: - import dateutil.parser - from dateutil.tz import tzlocal -except ImportError: - # this is to import all dependencies shipped with package (e.g. to use in qgis-plugin) - deps_dir = os.path.join(this_dir, "deps") - if os.path.exists(deps_dir): - import sys - - for f in os.listdir(os.path.join(deps_dir)): - sys.path.append(os.path.join(deps_dir, f)) - - import dateutil.parser - from dateutil.tz import tzlocal +# add dependencies shipped in deps/ on sys.path +deps_dir = os.path.join(this_dir, "deps") +if os.path.exists(deps_dir): + import sys + + for f in os.listdir(deps_dir): + dep_path = os.path.join(deps_dir, f) + if dep_path not in sys.path: + sys.path.append(dep_path) + +import dateutil.parser +from dateutil.tz import tzlocal class WorkspaceRole(Enum):