Set compat='no_conflicts' explicitly#1802
Merged
JoerivanEngelen merged 1 commit intomasterfrom Apr 9, 2026
Merged
Conversation
|
Contributor
Author
|
Tests pretty much succeeded, but they timed out because the modelsplitter unittests took most of the time. We really have to speed those up, but that is something for a separate PR. |
Manangka
pushed a commit
that referenced
this pull request
Apr 9, 2026
Fixes #1796 # Description Explicitly set compat='no_conflicts' to quell a noisy warning thrown repeatedly, as we call xr.merge a lot. This is the current default of xarray. We can later reconsider if this should be "override" in some cases. This would increase performance, at the risk of providing unexpected results when incorrect data is provided. We'd have to profile this on a heavy case (e.g. our user acceptance test) to see if it increases performance. # Checklist <!--- Before requesting review, please go through this checklist: --> - [x] Links to correct issue - [ ] Update changelog, if changes affect users - [x] PR title starts with ``Issue #nr``, e.g. ``Issue #737`` - [ ] Unit tests were added - [ ] **If feature added**: Added/extended example - [ ] **If feature added**: Added feature to API documentation - [ ] **If pixi.lock was changed**: Ran `pixi run generate-sbom` and committed changes
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #1796
Description
Explicitly set compat='no_conflicts' to quell a noisy warning thrown repeatedly, as we call xr.merge a lot. This is the current default of xarray.
We can later reconsider if this should be "override" in some cases. This would increase performance, at the risk of providing unexpected results when incorrect data is provided. We'd have to profile this on a heavy case (e.g. our user acceptance test) to see if it increases performance.
Checklist
Issue #nr, e.g.Issue #737pixi run generate-sbomand committed changes