Fix issue with asdftool diff #1652
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
compare 2 files that are identical except for block contents
eslavich
approved these changes
Sep 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
EDIT: also fixes the changelog moving entries that erroneously were added to 2.15.2 following rebasing of now merged PRs.
#1537 introduced a bug in asdftool diff where comparisons between two arrays that differ only by contents (and not by shape, dtype, etc) were considered identical.
This PR fixes that issue and introduces a test for the regression
test_diff_ndarray(and data files for this test).Additionally, this PR updates the output of asdftool diff to report which arrays differ. The changes above and this new output can be illustrated by comparing the output for the newly included test files
ndarray0.asdfandndarray1.asdf.Comparing these with asdf 2.15 produces:
The lack of the keys to find the array that differs is here considered a bug.
Running the same comparison with current asdf main produces no output which is certainly a bug.
With this PR the output is now:
As the bug introduced in #1537 has not yet been released the changelog entry only mentions the change in the diff output to include the array name.