Merge pull request #438 from dirac-institute/small_cleanups

Remove manual path construction

tests/test_configuration.py

@@ -1,5 +1,6 @@
 from astropy.io import fits
 from astropy.table import Table
+import os
 import tempfile
 import unittest
 from pathlib import Path
@@ -122,7 +123,7 @@ def test_save_and_load_yaml(self):
         config.set("mask_grow", 5)
 
         with tempfile.TemporaryDirectory() as dir_name:
-            file_path = f"{dir_name}/tmp_config_data.yaml"
+            file_path = os.path.join(dir_name, "tmp_config_data.yaml")
             self.assertFalse(Path(file_path).is_file())
 
             # Unable to load non-existent file.
@@ -155,7 +156,7 @@ def test_save_and_load_fits(self):
         config.set("mask_bits_dict", {"bit1": 1, "bit2": 2})
 
         with tempfile.TemporaryDirectory() as dir_name:
-            file_path = f"{dir_name}/test.fits"
+            file_path = os.path.join(dir_name, "test.fits")
             self.assertFalse(Path(file_path).is_file())
 
             # Unable to load non-existent file.

tests/test_end_to_end.py

@@ -1,5 +1,6 @@
 import math
 import numpy as np
+import os
 import tempfile
 import unittest
 
@@ -116,7 +117,7 @@ def test_e2e_work_unit(self):
         work = WorkUnit(im_stack=ds.stack, config=config)
 
         with tempfile.TemporaryDirectory() as dir_name:
-            file_path = f"{dir_name}/test_workunit.fits"
+            file_path = os.path.join(dir_name, "test_workunit.fits")
             work.to_fits(file_path)
 
             rs = SearchRunner()

tests/test_fake_data_creator.py

@@ -1,3 +1,4 @@
+import os
 import tempfile
 import unittest
 
@@ -90,7 +91,7 @@ def test_save_work_unit(self):
         ds = FakeDataSet(15, 10, num_images)
 
         with tempfile.TemporaryDirectory() as dir_name:
-            file_name = f"{dir_name}/fake_work_unit.fits"
+            file_name = os.path.join(dir_name, "fake_work_unit.fits")
             ds.save_fake_data_to_work_unit(file_name)
             self.assertTrue(Path(file_name).exists())
 

tests/test_file_utils.py

@@ -40,7 +40,7 @@ def test_visit_from_file_name(self):
     def test_save_load_csv(self):
         data = [[1.0, 2.0], [3.0, 4.0], [5.0, 6.0]]
         with tempfile.TemporaryDirectory() as dir_name:
-            file_name = f"{dir_name}/data1.dat"
+            file_name = os.path.join(dir_name, "data1.dat")
 
             # Check that there is nothing to load before saving the file.
             # By default FileUtils should raise a FileNotFoundError.
@@ -80,7 +80,7 @@ def test_load_times(self):
     def test_save_times(self):
         mapping = {"0001": 100.0, "0002": 110.0, "0003": 111.0}
         with tempfile.TemporaryDirectory() as dir_name:
-            file_name = f"{dir_name}/times.dat"
+            file_name = os.path.join(dir_name, "times.dat")
             FileUtils.save_time_dictionary(file_name, mapping)
             self.assertTrue(Path(file_name).is_file())
 
@@ -145,7 +145,7 @@ def test_save_and_load_single_result(self):
         trj.vy = 4.0
 
         with tempfile.TemporaryDirectory() as dir_name:
-            filename = f"{dir_name}/results_tmp.txt"
+            filename = os.path.join(dir_name, "results_tmp.txt")
             FileUtils.save_results_file(filename, [trj])
 
             loaded_trjs = FileUtils.load_results_file_as_trajectories(filename)

tests/test_raw_image.py

@@ -1,8 +1,8 @@
+import numpy as np
+import os
 import tempfile
 import unittest
 
-import numpy as np
-import timeit
 from kbmod.search import (
     HAS_GPU,
     KB_NO_DATA,
@@ -378,9 +378,7 @@ def test_read_write_file(self):
         """Test file writes and reads correctly."""
         img = RawImage(self.array, 10.0)
         with tempfile.TemporaryDirectory() as dir_name:
-            file_name = "tmp_RawImage"
-            full_path = "%s/%s.fits" % (dir_name, file_name)
-
+            full_path = os.path.join(dir_name, "tmp_RawImage.fits")
             img.save_fits(full_path)
 
             # Reload the file.
@@ -396,10 +394,7 @@ def test_stack_file(self):
         """Test multi-extension FITS files write and read correctly."""
         img = RawImage(self.array, 10.0)
         with tempfile.TemporaryDirectory() as dir_name:
-            file_name = "tmp_RawImage"
-            full_path = "%s/%s.fits" % (dir_name, file_name)
-
-            # Save the image and create a file.
+            full_path = os.path.join(dir_name, "tmp_RawImage.fits")
             img.save_fits(full_path)
 
             # Add 4 more layers at different times.