Commit 54ad42ba authored by Jakob Luettgau's avatar Jakob Luettgau
Browse files

Resolve merge conflict.

parents 18486628 8429a8e5
...@@ -168,7 +168,10 @@ def find_utils(ffi, libdutil): ...@@ -168,7 +168,10 @@ def find_utils(ffi, libdutil):
import glob import glob
library_path = glob.glob(f'{darshan_path}/libdarshan-util*.so')[0] library_path = glob.glob(f'{darshan_path}/libdarshan-util*.so')[0]
logger.debug(f"Attempting library_path={library_path} in case of binary wheel.") logger.debug(f"Attempting library_path={library_path} in case of binary wheel.")
save = os.getcwd()
os.chdir(darshan_path)
libdutil = ffi.dlopen(library_path) libdutil = ffi.dlopen(library_path)
os.chdir(save)
except: except:
libdutil = None libdutil = None
...@@ -178,7 +181,10 @@ def find_utils(ffi, libdutil): ...@@ -178,7 +181,10 @@ def find_utils(ffi, libdutil):
import glob import glob
library_path = glob.glob(f'{darshan_path}/libdarshan-util*.so')[0] library_path = glob.glob(f'{darshan_path}/libdarshan-util*.so')[0]
logger.debug(f"Attempting library_path={library_path} for pyinstaller bundles.") logger.debug(f"Attempting library_path={library_path} for pyinstaller bundles.")
save = os.getcwd()
os.chdir(darshan_path)
libdutil = ffi.dlopen(library_path) libdutil = ffi.dlopen(library_path)
os.chdir(save)
except: except:
libdutil = None libdutil = None
......
[bumpversion] [bumpversion]
current_version = 0.0.4 current_version = 0.0.5
commit = True commit = True
tag = True tag = True
......
...@@ -53,6 +53,6 @@ setup( ...@@ -53,6 +53,6 @@ setup(
test_suite='tests', test_suite='tests',
tests_require=test_requirements, tests_require=test_requirements,
url='https://www.mcs.anl.gov/research/projects/darshan/', url='https://www.mcs.anl.gov/research/projects/darshan/',
version='0.0.4', version='0.0.5',
zip_safe=False, zip_safe=False,
) )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment