Skip to content
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.

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

combine_attrs merge errors with compat="minimal" are silenced #5262

Merged
merged 4 commits into from
May 5, 2021

Conversation

keewis
Copy link
Collaborator

@keewis keewis commented May 5, 2021

follow-up to #4902: the way it was written, calling xr.merge(..., combine_attrs="no_conflicts", compat="minimal") would silence MergeError. The tests didn't catch this because I was trying to test both variables and dimension variables at the same time, and the dimension variable raised.

If I'm wrong in assuming that compat="minimal" should not interfere with combine_attrs I guess we can close this (or remove everything except the change to raise the merge error from the value error).

  • Tests added
  • Passes pre-commit run --all-files

Copy link
Member

@shoyer shoyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this change. Merging attributes should be logically separate from compat.

@dcherian dcherian merged commit b883fea into pydata:master May 5, 2021
@keewis keewis deleted the fix-no_conflicts branch May 5, 2021 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants