Resolve merge conflict.

darshan-util/pydarshan/darshan/discover_darshan.py

@@ -168,7 +168,10 @@ def find_utils(ffi, libdutil):
             import glob
             library_path = glob.glob(f'{darshan_path}/libdarshan-util*.so')[0]
             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)
+            os.chdir(save)
         except:
             libdutil = None
 
@@ -178,7 +181,10 @@ def find_utils(ffi, libdutil):
             import glob
             library_path = glob.glob(f'{darshan_path}/libdarshan-util*.so')[0]
             logger.debug(f"Attempting library_path={library_path} for pyinstaller bundles.")
+            save = os.getcwd()
+            os.chdir(darshan_path)
             libdutil = ffi.dlopen(library_path)
+            os.chdir(save)
         except:
             libdutil = None
   

darshan-util/pydarshan/setup.cfg

 [bumpversion]
-current_version = 0.0.4
+current_version = 0.0.5
 commit = True
 tag = True
 

darshan-util/pydarshan/setup.py

@@ -53,6 +53,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://www.mcs.anl.gov/research/projects/darshan/',
-    version='0.0.4',
+    version='0.0.5',
     zip_safe=False,
 )