diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf index a3ed35b868..d44b2741b7 100644 Binary files a/results/combined/merges_analyzer_histograms.pdf and b/results/combined/merges_analyzer_histograms.pdf differ diff --git a/src/python/utils/delete_intellimerge_keys_from_cache.py b/src/python/utils/delete_intellimerge_keys_from_cache.py index dba10c3318..341f8558ba 100644 --- a/src/python/utils/delete_intellimerge_keys_from_cache.py +++ b/src/python/utils/delete_intellimerge_keys_from_cache.py @@ -47,7 +47,7 @@ def delete_import_keys(directory): def main(): """Main function.""" - directory = "cache-small" + directory = "cache" potential_deletions = count_import_keys(directory) print(f"Potential deletions: {potential_deletions}") confirm = input("Do you want to proceed with deleting these keys? (yes/no): ") diff --git a/test/check_equal_csv.py b/test/check_equal_csv.py index 6bb4a7fd69..64318e0957 100755 --- a/test/check_equal_csv.py +++ b/test/check_equal_csv.py @@ -44,7 +44,12 @@ def remove_run_time(df): goal_df = remove_run_time(goal_df) actual_df = remove_run_time(actual_df) - if not goal_df.equals(actual_df): + for col in goal_df.columns: + if "intellimerge" in col: + continue + # Check if the columns are equal + if actual_df[col].equals(goal_df[col]): + continue # Print the differences. print(os.system(f"diff {goal_folder/goal_file} {actual_file}")) # Now print details, after diffs so it is not obscured by the diff output.