Skip to content

idiff acceptance fix #5482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjlittle merged 8 commits into from
Sep 14, 2023
Merged

idiff acceptance fix #5482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5eb7fe
removed duplication case in Accept
ESadek-MO Sep 7, 2023
abcb94b
updated docstring
ESadek-MO Sep 7, 2023
bc6ec85
Merge branch 'main' into idiff_fix
ESadek-MO Sep 7, 2023
169a752
corrected whatsnew (hopefully)
ESadek-MO Sep 14, 2023
26d76d6
merge conflict
ESadek-MO Sep 14, 2023
20fc36f
the merge undid the fix. Here we go
ESadek-MO Sep 14, 2023
0b6ea3e
removed trailng . from whatsnew
ESadek-MO Sep 14, 2023
290f3fd
changed ref to mod
ESadek-MO Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/src/whatsnew/latest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ This document explains the changes made to Iris for this release

#. `@scottrobinson02`_ fixed the output units when dividing a coordinate by a
cube. (:issue:`5305`, :pull:`5331`)

#. `@ESadek-MO`_ has updated :mod:`iris.tests.graphics.idiff` to stop duplicated file names
preventing acceptance. (:issue:`5098`, :pull:`5482`)


💣 Incompatible Changes
Expand Down
17 changes: 6 additions & 11 deletions lib/iris/tests/graphics/idiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,12 @@ def diff_viewer(
repo = graphics.read_repo_json()

def accept(event):
if test_id not in repo:
repo[test_id] = phash
graphics.write_repo_json(repo)
out_file = result_dir / (test_id + ".png")
result_path.rename(out_file)
msg = f"ACCEPTED: {result_path.name} -> {out_file.name}"
print(msg)
else:
msg = f"DUPLICATE: {result_path.name} -> {expected_path.name} (ignored)"
print(msg)
result_path.unlink()
repo[test_id] = phash
graphics.write_repo_json(repo)
out_file = result_dir / (test_id + ".png")
result_path.rename(out_file)
msg = f"ACCEPTED: {result_path.name} -> {out_file.name}"
print(msg)
diff_fname.unlink()
plt.close()

Expand Down