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

Fix to_xarray_dataset merge error with conflicting values in coordinate #2827

Merged
merged 11 commits into from
Jan 21, 2025

Conversation

BENR0
Copy link
Collaborator

@BENR0 BENR0 commented Jun 14, 2024

Fixes the merge error Problem by allowing to pass the compat argument.

@BENR0 BENR0 requested review from djhoese and mraspaud as code owners June 14, 2024 12:08
Copy link

codecov bot commented Jun 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.10%. Comparing base (38d106d) to head (43f8ce9).
Report is 37 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2827      +/-   ##
==========================================
- Coverage   96.10%   96.10%   -0.01%     
==========================================
  Files         381      381              
  Lines       55544    55559      +15     
==========================================
+ Hits        53383    53397      +14     
- Misses       2161     2162       +1     
Flag Coverage Δ
behaviourtests 3.89% <4.34%> (-0.01%) ⬇️
unittests 96.20% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@djhoese djhoese left a comment

Choose a reason for hiding this comment

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

This looks good to me except the type annotation on compat which I've commented on inline. If that is resolved then this is good to merge.

@djhoese
Copy link
Member

djhoese commented Jul 21, 2024

The failing test output really doesn't help determine what is wrong/unequal for that test.

Benjamin Rösner added 2 commits November 19, 2024 10:45
@coveralls
Copy link

coveralls commented Nov 19, 2024

Pull Request Test Coverage Report for Build 12883477811

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 23 of 23 (100.0%) changed or added relevant lines in 2 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage remained the same at 96.214%

Files with Coverage Reduction New Missed Lines %
satpy/scene.py 1 92.25%
Totals Coverage Status
Change from base Build 12870674719: 0.0%
Covered Lines: 53643
Relevant Lines: 55754

💛 - Coveralls

@mraspaud
Copy link
Member

@djhoese are you happy with this PR?

@djhoese djhoese added enhancement code enhancements, features, improvements component:scene labels Jan 21, 2025
@djhoese djhoese self-assigned this Jan 21, 2025
@djhoese djhoese changed the title Fix to xr dataset merge error with conflicting values in coordinate Fix to_xarray_dataset merge error with conflicting values in coordinate Jan 21, 2025
@djhoese djhoese merged commit 9a40616 into pytroll:main Jan 21, 2025
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:scene enhancement code enhancements, features, improvements
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

MergeError in to_xarray_dataset for Scenes containing data from seviri_l1b_nc reader
4 participants