From cf35e9f8b50f4a2d2cdc68662eac8e6fa9598b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schm=C3=B6lder?= Date: Mon, 17 Jun 2024 17:20:20 +0200 Subject: [PATCH] Do not modify LD_LIBRARY_PATH when setting install_path Previously, it was required to add /lib to LD_LIBRARY_PATH because CADET-Core was not setting the RPATH correctly. This was fixed in CADET v4.4.0 Since the lib path was simply appended to os.environ['LD_LIBRARY_PATH'] this could lead to inconsistent behaviour when trying to compare different versions of CADET-Core and other versions were not properly removed. --- cadet/cadet.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cadet/cadet.py b/cadet/cadet.py index a4257fe..d63d4e4 100644 --- a/cadet/cadet.py +++ b/cadet/cadet.py @@ -1,6 +1,5 @@ import copy import json -import os import platform import pprint import shutil @@ -337,15 +336,6 @@ def install_path(self, install_path): if dll_path.is_file(): self.cadet_dll_path = dll_path.as_posix() - if platform.system() != 'Windows': - try: - cadet_lib_path = cadet_root / 'lib' - if cadet_lib_path.as_posix() not in os.environ['LD_LIBRARY_PATH']: - os.environ['LD_LIBRARY_PATH'] += \ - os.pathsep + cadet_lib_path.as_posix() - except KeyError: - os.environ['LD_LIBRARY_PATH'] = cadet_lib_path.as_posix() - def transform(self, x): return str.upper(x)