Skip to content

Conversation

@trexfeathers
Copy link
Contributor

@trexfeathers trexfeathers commented Mar 4, 2024

Merge via a merge commit

(Do not squash)

No doubt problematic due to my reversion in #5798

The only meaningful change needed is the change to the What's New. Would it be acceptable to just create a pull request that manually makes that change? Or is it important that main includes the commits from 3.7.x?

trexfeathers and others added 5 commits March 4, 2024 13:26
This reverts commit 875e890, reversing
changes made to 932fd93.
…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 <[email protected]>
@trexfeathers trexfeathers added the Type: Merge Back Merging a feature branch back to main label Mar 4, 2024
@codecov
Copy link

codecov bot commented Mar 4, 2024

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 (93d7d4a).
Report is 112 commits behind head on main.

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             @@
##             main    #5802      +/-   ##
==========================================
- 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.

@github-actions github-actions bot added the benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts label Mar 4, 2024
@trexfeathers
Copy link
Contributor Author

Replaced by #5857

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts Type: Merge Back Merging a feature branch back to main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants