From cc622b9b1eb1e213f5ec28921ddc8b570c023fb5 Mon Sep 17 00:00:00 2001 From: lochhh Date: Tue, 21 Jan 2025 17:20:47 +0000 Subject: [PATCH] Fix newlines --- tests/test_integration/test_io.py | 4 +-- .../test_kinematics_vector_transform.py | 5 +--- tests/test_unit/test_filtering.py | 5 +--- tests/test_unit/test_kinematics.py | 26 ++++--------------- tests/test_unit/test_logging.py | 5 +--- tests/test_unit/test_reports.py | 5 +--- tests/test_unit/test_save_poses.py | 23 ++++------------ .../test_validators/test_array_validators.py | 4 +-- 8 files changed, 16 insertions(+), 61 deletions(-) diff --git a/tests/test_integration/test_io.py b/tests/test_integration/test_io.py index d66b62b4c..50f039335 100644 --- a/tests/test_integration/test_io.py +++ b/tests/test_integration/test_io.py @@ -30,9 +30,7 @@ def test_save_and_load_dlc_file( loading them back in returns the same Dataset. """ save_poses.to_dlc_file( - valid_poses_dataset, - dlc_output_file, - split_individuals=False, + valid_poses_dataset, dlc_output_file, split_individuals=False ) ds = load_poses.from_dlc_file(dlc_output_file) xr.testing.assert_allclose(ds, valid_poses_dataset) diff --git a/tests/test_integration/test_kinematics_vector_transform.py b/tests/test_integration/test_kinematics_vector_transform.py index f43093477..38ab5f63b 100644 --- a/tests/test_integration/test_kinematics_vector_transform.py +++ b/tests/test_integration/test_kinematics_vector_transform.py @@ -10,10 +10,7 @@ @pytest.mark.parametrize( "valid_dataset_uniform_linear_motion", - [ - "valid_poses_dataset", - "valid_bboxes_dataset", - ], + ["valid_poses_dataset", "valid_bboxes_dataset"], ) @pytest.mark.parametrize( "kinematic_variable, expected_kinematics_polar", diff --git a/tests/test_unit/test_filtering.py b/tests/test_unit/test_filtering.py index 581a629c7..d9eacff3c 100644 --- a/tests/test_unit/test_filtering.py +++ b/tests/test_unit/test_filtering.py @@ -51,10 +51,7 @@ def test_filter_with_nans_on_position( """ # Expected number of nans in the position array per individual expected_nans_in_filtered_position_per_indiv = { - "valid_poses_dataset": [ - 0, - 0, - ], # no nans in input + "valid_poses_dataset": [0, 0], # no nans in input "valid_bboxes_dataset": [0, 0], # no nans in input "valid_poses_dataset_with_nan": [38, 0], "valid_bboxes_dataset_with_nan": [14, 0], diff --git a/tests/test_unit/test_kinematics.py b/tests/test_unit/test_kinematics.py index 708650988..1f24bb9cd 100644 --- a/tests/test_unit/test_kinematics.py +++ b/tests/test_unit/test_kinematics.py @@ -10,10 +10,7 @@ @pytest.mark.parametrize( "valid_dataset_uniform_linear_motion", - [ - "valid_poses_dataset", - "valid_bboxes_dataset", - ], + ["valid_poses_dataset", "valid_bboxes_dataset"], ) @pytest.mark.parametrize( "kinematic_variable, expected_kinematics", @@ -90,10 +87,7 @@ def test_kinematics_uniform_linear_motion( @pytest.mark.parametrize( "valid_dataset_with_nan", - [ - "valid_poses_dataset_with_nan", - "valid_bboxes_dataset_with_nan", - ], + ["valid_poses_dataset_with_nan", "valid_bboxes_dataset_with_nan"], ) @pytest.mark.parametrize( "kinematic_variable, expected_nans_per_individual", @@ -222,10 +216,7 @@ def test_approximate_derivative_with_invalid_order(order): ], ) def test_path_length_across_time_ranges( - valid_poses_dataset, - start, - stop, - expected_exception, + valid_poses_dataset, start, stop, expected_exception ): """Test path length computation for a uniform linear motion case, across different time ranges. @@ -568,10 +559,7 @@ def test_cdist_with_known_values(dim, expected_data, valid_poses_dataset): @pytest.mark.parametrize( "valid_dataset", - [ - "valid_poses_dataset", - "valid_bboxes_dataset", - ], + ["valid_poses_dataset", "valid_bboxes_dataset"], ) @pytest.mark.parametrize( "selection_fn", @@ -694,11 +682,7 @@ def test_compute_pairwise_distances_with_valid_pairs( "keypoints", "invalid_string", ), # invalid pairs - ( - "valid_poses_dataset", - "individuals", - {}, - ), # empty pairs + ("valid_poses_dataset", "individuals", {}), # empty pairs ("missing_dim_poses_dataset", "keypoints", "all"), # invalid dataset ( "missing_dim_bboxes_dataset", diff --git a/tests/test_unit/test_logging.py b/tests/test_unit/test_logging.py index 348a36872..583fd79af 100644 --- a/tests/test_unit/test_logging.py +++ b/tests/test_unit/test_logging.py @@ -48,10 +48,7 @@ def test_log_warning(caplog): @pytest.mark.parametrize( "input_data", - [ - "valid_poses_dataset", - "valid_bboxes_dataset", - ], + ["valid_poses_dataset", "valid_bboxes_dataset"], ) @pytest.mark.parametrize( "selector_fn, expected_selector_type", diff --git a/tests/test_unit/test_reports.py b/tests/test_unit/test_reports.py index e62791ddf..d7c896a4c 100644 --- a/tests/test_unit/test_reports.py +++ b/tests/test_unit/test_reports.py @@ -53,10 +53,7 @@ def test_report_nan_values_in_position_selecting_individual( @pytest.mark.parametrize( "valid_dataset", - [ - "valid_poses_dataset", - "valid_poses_dataset_with_nan", - ], + ["valid_poses_dataset", "valid_poses_dataset_with_nan"], ) @pytest.mark.parametrize( "data_selection, expected_keypoints, expected_individuals", diff --git a/tests/test_unit/test_save_poses.py b/tests/test_unit/test_save_poses.py index 9e0d47683..ae812f891 100644 --- a/tests/test_unit/test_save_poses.py +++ b/tests/test_unit/test_save_poses.py @@ -122,10 +122,7 @@ def test_to_dlc_style_df(self, ds, expected_exception): ] def test_to_dlc_file_valid_dataset( - self, - output_file_params, - valid_poses_dataset, - request, + self, output_file_params, valid_poses_dataset, request ): """Test that saving a valid pose dataset to a valid/invalid DeepLabCut-style file returns the appropriate errors. @@ -178,9 +175,7 @@ def test_auto_split_individuals(self, valid_poses_dataset, split_value): indirect=["valid_poses_dataset"], ) def test_to_dlc_style_df_split_individuals( - self, - valid_poses_dataset, - split_individuals, + self, valid_poses_dataset, split_individuals ): """Test that the `split_individuals` argument affects the behaviour of the `to_dlc_style_df` function as expected. @@ -234,9 +229,7 @@ def test_to_dlc_file_split_individuals( """ with expected_exception: save_poses.to_dlc_file( - valid_poses_dataset, - new_h5_file, - split_individuals, + valid_poses_dataset, new_h5_file, split_individuals ) # Get the names of the individuals in the dataset ind_names = valid_poses_dataset.individuals.values @@ -255,10 +248,7 @@ def test_to_dlc_file_split_individuals( file_path_ind.unlink() def test_to_lp_file_valid_dataset( - self, - output_file_params, - valid_poses_dataset, - request, + self, output_file_params, valid_poses_dataset, request ): """Test that saving a valid pose dataset to a valid/invalid LightningPose-style file returns the appropriate errors. @@ -286,10 +276,7 @@ def test_to_lp_file_invalid_dataset( ) def test_to_sleap_analysis_file_valid_dataset( - self, - output_file_params, - valid_poses_dataset, - request, + self, output_file_params, valid_poses_dataset, request ): """Test that saving a valid pose dataset to a valid/invalid SLEAP-style file returns the appropriate errors. diff --git a/tests/test_unit/test_validators/test_array_validators.py b/tests/test_unit/test_validators/test_array_validators.py index c19f4c116..62b0d5699 100644 --- a/tests/test_unit/test_validators/test_array_validators.py +++ b/tests/test_unit/test_validators/test_array_validators.py @@ -46,9 +46,7 @@ def expect_value_error_with_message(error_msg): valid_cases + invalid_cases, ) def test_validate_dims_coords( - valid_poses_dataset, # fixture from conftest.py - required_dims_coords, - expected_exception, + valid_poses_dataset, required_dims_coords, expected_exception ): """Test validate_dims_coords for both valid and invalid inputs.""" position_array = valid_poses_dataset["position"]