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

Simplify and lazify broadcast_to_shape (#5307) #5359

Merged
merged 2 commits into from
Jun 26, 2023

Conversation

bjlittle
Copy link
Member

🚀 Pull Request

Description

This pull-request cherry-picks the merge commit (48e3a86) of #5307 from main to the v3.6.x release feature branch.

This is required to support #5341 in the v3.6.1 patch release.


Consult Iris pull request check list

* working for all except masked lazy

* use moveaxis

* handle lazy masked case

* add tests for is_lazy_masked_data

* whatsnew

* check compute isn't called

* update docstring
@bjlittle bjlittle requested a review from trexfeathers June 26, 2023 11:37
@codecov
Copy link

codecov bot commented Jun 26, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.01 🎉

Comparison is base (9e2cff5) 89.32% compared to head (8fa83d2) 89.34%.

Additional details and impacted files
@@            Coverage Diff             @@
##           v3.6.x    #5359      +/-   ##
==========================================
+ Coverage   89.32%   89.34%   +0.01%     
==========================================
  Files          89       89              
  Lines       22398    22400       +2     
  Branches     5375     5373       -2     
==========================================
+ Hits        20008    20014       +6     
+ Misses       1640     1638       -2     
+ Partials      750      748       -2     
Impacted Files Coverage Δ
lib/iris/_lazy_data.py 100.00% <100.00%> (ø)
lib/iris/util.py 90.47% <100.00%> (+0.68%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

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

Thanks @bjlittle. The What's New entry looks good, and is consistent with previous times when this was necessary.

@trexfeathers trexfeathers merged commit f436cbc into SciTools:v3.6.x Jun 26, 2023
@trexfeathers
Copy link
Contributor

trexfeathers commented Jun 26, 2023

Note I have knowingly forced some conflict resolution when we next do the merge-back from v3.6.x to main. This seemed appropriate in this case since the codebase changes are already on main, so the end result won't involve polluting the commit history of main.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: 🏁 Done - v3.6.1
Development

Successfully merging this pull request may close these issues.

3 participants