-
Notifications
You must be signed in to change notification settings - Fork 297
Move loading and combine code into their own submodules. #6321
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
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #6321 +/- ##
=======================================
Coverage 89.88% 89.88%
=======================================
Files 88 90 +2
Lines 23430 23447 +17
Branches 4361 4361
=======================================
+ Hits 21059 21076 +17
Misses 1644 1644
Partials 727 727 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, much neater this way.
Thanks @stephenworsley ! |
* upstream/main: (98 commits) [pre-commit.ci] pre-commit autoupdate (SciTools#6335) SPEC 0: drop py310 and support py313 (SciTools#6195) Better benchmarking Python version handling (SciTools#6329) Move loading and combine code into their own submodules. (SciTools#6321) Bump scitools/workflows from 2025.02.1 to 2025.02.2 (SciTools#6327) replaced reference from build to python build (SciTools#6324) [pre-commit.ci] pre-commit autoupdate (SciTools#6315) Cache Dask arrays created from `NetCDFDataProxy`s to speed up loading files with multiple variables (SciTools#6252) Bump scitools/workflows from 2025.02.0 to 2025.02.1 (SciTools#6313) [pre-commit.ci] pre-commit autoupdate (SciTools#6310) Bump scitools/workflows from 2025.01.5 to 2025.02.0 (SciTools#6306) Updated environment lockfiles (SciTools#6301) Improve speed of loading small NetCDF files (SciTools#6229) [pre-commit.ci] pre-commit autoupdate (SciTools#6298) Use cube chunks for weights in aggregations with smart weights (SciTools#6288) Updated environment lockfiles (SciTools#6296) Bump scitools/workflows from 2025.01.4 to 2025.01.5 (SciTools#6300) Bump scitools/workflows from 2025.01.3 to 2025.01.4 (SciTools#6295) Lazy rectilinear interpolator (SciTools#6084) Revert "Fix broken link. (SciTools#6246)" (SciTools#6297) ...
Replaces #6199
This is supposedly a "pure refactor"
Except for some rewrites of docstrings, and changes to tests where they imported some (non-public) routines which have moved
Effectively the following things happened ..
iris.LoadPolicy
has been renamedCombineOptions
-- butLoadPolicy
still exists as an alternative nameiris.__init__
and are now defined iniris.loading
(but still publicly declared in the
iris
module) :LoadPolicy
,LOAD_POLICY
,load
,load_cube
,load_cubes
andload_raw
-- though
LoadPolicy
is now "really"CombinePolicy
and the definition is actually iniris._combine
iris/__init__
toiris.loading
:_generate_cubes
,_load_collection
iris.cube
toiris.loading
(though these ones aren't public) :_CubeFilter
,_CubeFilterCollection
iris.__init__
toiris._combine
:_combine_cubes
,_combine_load_cubes
, andCombineCubes
(which before wasLoadPolicy
)