Merge pull request #680 from neutrinoceros/enh/dataset-from-path

ENH: add support for loading Dataset from a `pathlib.Path`

Author: VChristiaens

src/vip_hci/config/utils_conf.py

@@ -15,6 +15,7 @@
 from importlib.metadata import version
 from inspect import signature, Parameter
 from functools import wraps
+from pathlib import Path
 import multiprocessing
 import warnings
 
@@ -69,10 +70,11 @@ def save(self, filename):
 
     @classmethod
     def load(cls, filename):
+        filename = Path(filename).resolve()
         try:
             data = np.load(filename, allow_pickle=True)
-        except BaseException:
-            data = np.load(filename + ".npz", allow_pickle=True)
+        except FileNotFoundError:
+            data = np.load(filename.with_suffix(".npz"), allow_pickle=True)
 
         if "_vip_object" not in data:
             raise RuntimeError("The file you specified is not a VIP object.")

tests/pre_3_10/test_dataset.py

@@ -4,7 +4,6 @@
 
 __author__ = "Ralf Farkas"
 
-import tempfile
 import os
 import sys
 
@@ -14,7 +13,7 @@
 from vip_hci.objects.dataset import Dataset
 
 
-def test_saveable_dataset():
+def test_saveable_dataset(tmp_path):
     """
     Test the HCIDataset.save() and .load() methods
     """
@@ -26,7 +25,7 @@ def test_saveable_dataset():
     ds = Dataset(cube=cube, angles=angles, fwhm=fwhm)
 
     # save
-    fd, fn = tempfile.mkstemp(prefix="vip_")
+    fn = tmp_path / 'test'
     ds.save(fn)
 
     # restore
@@ -36,6 +35,3 @@ def test_saveable_dataset():
     aarc(ds2.cube, cube)
     aarc(ds2.angles, angles)
     assert ds2.fwhm == fwhm
-
-    # cleanup
-    os.remove(fn)