Skip to content

v3.7.1 updates#5798

Merged
bjlittle merged 4 commits intoSciTools:v3.7.xfrom
trexfeathers:v3.7.x.updates
Mar 4, 2024
Merged

v3.7.1 updates#5798
bjlittle merged 4 commits intoSciTools:v3.7.xfrom
trexfeathers:v3.7.x.updates

Conversation

@trexfeathers
Copy link
Contributor

@trexfeathers trexfeathers commented Mar 4, 2024 •
edited
Loading

Merge using a merge commit

(Do not squash)

  • Revert the mistaken merge of main into v3.7.x (875e890)
  • Cherry-pick area weighted memory fix (c6151e8)
  • Update What's New

Combined, this should update v3.7.x to the state at v3.7.0 plus the change in #5767.

trexfeathers and others added 3 commits March 4, 2024 13:26
@trexfeathers
Revert "Merge branch 'main' into v3.7.x"
1f079a6 
This reverts commit 875e890, reversing
changes made to 932fd93.
@stephenworsley @pre-commit-ci @trexfeathers
Cherry-pick: Fix usage of map_blocks in AreaWeighted and elsewhere (S…
05ebf77 
…ciTools#5767)

* fix usage of map_blocks

* fix map_blocks for non-lazy data

* add benchmark

* unskip benchmark

* add benchmark

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove benchmarks

* remove unnecessary import

* What's New entry.

* map_complete_blocks docstring.

* map_complete_blocks returns.

* Typo.

* Typo.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Martin Yeo <martin.yeo@metoffice.gov.uk>
@trexfeathers
What's New patch.
789d75f
@trexfeathers trexfeathers requested a review from bjlittle March 4, 2024 14:07
@trexfeathers trexfeathers changed the title v3.7.1 updates. v3.7.1 updates Mar 4, 2024
@codecov
Copy link

codecov bot commented Mar 4, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 83.79531% with 76 lines in your changes are missing coverage. Please review.

Project coverage is 89.37%. Comparing base (875e890) to head (6386998).

Files Patch % Lines
lib/iris/analysis/_area_weighted.py 84.67% 23 Missing and 15 partials ⚠️
lib/iris/aux_factory.py 21.42% 11 Missing ⚠️
lib/iris/fileformats/netcdf/saver.py 82.35% 5 Missing and 1 partial ⚠️
lib/iris/fileformats/cf.py 62.50% 3 Missing ⚠️
lib/iris/__init__.py 33.33% 2 Missing ⚠️
lib/iris/analysis/cartography.py 33.33% 2 Missing ⚠️
lib/iris/fileformats/_nc_load_rules/helpers.py 88.88% 2 Missing ⚠️
lib/iris/plot.py 75.00% 2 Missing ⚠️
lib/iris/quickplot.py 81.81% 1 Missing and 1 partial ⚠️
lib/iris/analysis/_regrid.py 50.00% 1 Missing ⚠️
... and 7 more
Additional details and impacted files 
@@            Coverage Diff             @@
##           v3.7.x    #5798      +/-   ##
==========================================
- Coverage   89.68%   89.37%   -0.32%     
==========================================
  Files          90       89       -1     
  Lines       22818    22444     -374     
  Branches     5446     5382      -64     
==========================================
- Hits        20465    20059     -406     
- Misses       1619     1639      +20     
- Partials      734      746      +12

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

@bjlittle bjlittle self-assigned this Mar 4, 2024
@bjlittle
Copy link
Member

bjlittle commented Mar 4, 2024

The following compare proves that the revert commit 1f079a6 of this pull-request has indeed undone commit 875e890, which is the merge of main into the v3.7.x release feature branch, returning us to the state of commit 932fd93 on the v3.7.x release feature branch prior to the merge of main:

932fd93...trexfeathers:1f079a632c635699990ac9f7c89019026156cf87

bjlittle
bjlittle approved these changes Mar 4, 2024
View reviewed changes
Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

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

@trexfeathers Lovely piece of work mate. This one was tricksy and you nailed it 🥇 💯

@trexfeathers trexfeathers deleted the v3.7.x.updates branch March 4, 2024 15:30
@trexfeathers trexfeathers restored the v3.7.x.updates branch March 4, 2024 15:31
@trexfeathers trexfeathers reopened this Mar 4, 2024
@bjlittle bjlittle merged commit 93d7d4a into SciTools:v3.7.x Mar 4, 2024
@trexfeathers
Copy link
Contributor Author

trexfeathers commented Mar 4, 2024

Thanks @bjlittle!

@trexfeathers trexfeathers mentioned this pull request Mar 4, 2024
Closed
@trexfeathers trexfeathers deleted the v3.7.x.updates branch May 3, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjlittle bjlittle bjlittle approved these changes

Assignees

@bjlittle bjlittle

Labels

Release: Patch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@trexfeathers @bjlittle @stephenworsley