From a8aa1de41c3cc78a3900228045152c6669b78b53 Mon Sep 17 00:00:00 2001 From: Laurent Guerard Date: Tue, 8 Apr 2025 13:15:28 +0200 Subject: [PATCH 1/3] Fix variable for the path --- tests/bdv/test_define_dataset_auto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bdv/test_define_dataset_auto.py b/tests/bdv/test_define_dataset_auto.py index 08c53882..0cf83e30 100644 --- a/tests/bdv/test_define_dataset_auto.py +++ b/tests/bdv/test_define_dataset_auto.py @@ -35,7 +35,7 @@ def set_default_values( + ".xml" + "] " + "path=[" - + file_info["path"] + + file_info["full"] + "] " + "exclude=10 " + "bioformats_series_are?=" From d7723814b22bef2c125eff3ab7b9066b9db47106 Mon Sep 17 00:00:00 2001 From: Laurent Guerard Date: Tue, 8 Apr 2025 13:15:34 +0200 Subject: [PATCH 2/3] Ruff formatting --- tests/bdv/test_define_dataset_auto.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/bdv/test_define_dataset_auto.py b/tests/bdv/test_define_dataset_auto.py index 0cf83e30..deab43d1 100644 --- a/tests/bdv/test_define_dataset_auto.py +++ b/tests/bdv/test_define_dataset_auto.py @@ -6,9 +6,7 @@ from imcflibs.imagej import bdv -def set_default_values( - project_filename, file_path, series_type="Tiles" -): +def set_default_values(project_filename, file_path, series_type="Tiles"): """Set the default values for dataset definitions. Parameters @@ -106,9 +104,7 @@ def test_define_dataset_auto_tile(tmp_path, caplog): final_call = "IJ.run(cmd=[%s], params=[%s])" % (cmd, options) # Define the dataset using the "Auto-Loader" option - bdv.define_dataset_auto( - project_filename, file_info["path"], bf_series_type - ) + bdv.define_dataset_auto(project_filename, file_info["path"], bf_series_type) # Check if the final call is in the log assert final_call == caplog.messages[0] @@ -146,9 +142,7 @@ def test_define_dataset_auto_angle(tmp_path, caplog): cmd = "Define Multi-View Dataset" # Set the default values for dataset definitions - options = set_default_values( - project_filename, file_path, bf_series_type - ) + options = set_default_values(project_filename, file_path, bf_series_type) # Construct the options for dataset definitions options = ( @@ -175,8 +169,6 @@ def test_define_dataset_auto_angle(tmp_path, caplog): final_call = "IJ.run(cmd=[%s], params=[%s])" % (cmd, options) # Define the dataset using the "Auto-Loader" option - bdv.define_dataset_auto( - project_filename, file_info["path"], bf_series_type - ) + bdv.define_dataset_auto(project_filename, file_info["path"], bf_series_type) # Check if the final call is in the log assert final_call == caplog.messages[0] From ebb5e966df0cd2e14a0fca251a6636c301354b83 Mon Sep 17 00:00:00 2001 From: Laurent Guerard Date: Tue, 8 Apr 2025 13:31:21 +0200 Subject: [PATCH 3/3] Fix path to work with testing --- tests/bdv/test_define_dataset_auto.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bdv/test_define_dataset_auto.py b/tests/bdv/test_define_dataset_auto.py index deab43d1..05f48304 100644 --- a/tests/bdv/test_define_dataset_auto.py +++ b/tests/bdv/test_define_dataset_auto.py @@ -78,7 +78,7 @@ def test_define_dataset_auto_tile(tmp_path, caplog): cmd = "Define Multi-View Dataset" # Set the default values for dataset definitions - options = set_default_values(project_filename, file_path) + options = set_default_values(project_filename, file_info["path"]) # Construct the options for dataset definitions options = ( @@ -142,7 +142,7 @@ def test_define_dataset_auto_angle(tmp_path, caplog): cmd = "Define Multi-View Dataset" # Set the default values for dataset definitions - options = set_default_values(project_filename, file_path, bf_series_type) + options = set_default_values(project_filename, file_info["path"], bf_series_type) # Construct the options for dataset definitions options = (