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

Enable factory references to create new dimensions on load. (#6168) #6194

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

stephenworsley
Copy link
Contributor

Merge feature branch with changes made by #6168.

* Enable factory references to create new dimensions on load.

* Skip hanging tests.

* Skip more hanging tests.

* Adjust misleading comment.

* Add policy control and auto-detect. NOTE: for now only load, not load_cubes/load_cube

* Add temporary testcode.  NB no actual test, just printout.

* Replaced _CubeFilterCollection.merged() with combined(); replace uses in load;load_cube/load_cubes.

* Fix licence header

* Fix to handle empty reference correctly.

* Fix tests.

* Simplify policy options and tidy api.

* More documentation of loading options.

* Fix doctest.

* Fix repeated combination.

* Minor docs improvements.

* Initial load functions testing (WIP).

More

* Integration tests for time-varying reference fields.

* Fix test result.

* Make grib test optional.

* Review changes

* Reinstate skipped tests.

* Make combine_cubes work with plain lists; Make 'combine_cubes' private API.

* Add tests for combine_cubes.

* Add tests for LoadPolicy API.

* Add special split-netcdf roundtrip testing.

* Removed unwanted 'policy' keyword from iris.load .

* Make LoadPolicy examples more consistent.

* Review changes : documentation improvements.

* Doctest fix

* fix controlling_merge docs

* LOAD_POLICY uses 'default' settings by default.

* Various quick fixes to legacy tests.

* Added whatsnew.

---------

Co-authored-by: stephen.worsley <[email protected]>
Copy link

codecov bot commented Oct 25, 2024

Codecov Report

Attention: Patch coverage is 95.53571% with 5 lines in your changes missing coverage. Please review.

Project coverage is 89.87%. Comparing base (e892fd1) to head (27359ee).
Report is 4 commits behind head on main.

Files with missing lines Patch % Lines
lib/iris/__init__.py 93.33% 4 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6194      +/-   ##
==========================================
+ Coverage   89.82%   89.87%   +0.05%     
==========================================
  Files          88       88              
  Lines       23185    23303     +118     
  Branches     4314     4335      +21     
==========================================
+ Hits        20825    20944     +119     
  Misses       1628     1628              
+ Partials      732      731       -1     

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

@ESadek-MO ESadek-MO self-requested a review October 25, 2024 11:59
Copy link
Contributor

@ESadek-MO ESadek-MO left a comment

Choose a reason for hiding this comment

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

Thanks @stephenworsley. I'm content this is essentially #6168, which has already been reviewed and merged, so happy to approve this too.

@ESadek-MO ESadek-MO merged commit b9a950a into main Oct 25, 2024
29 checks passed
@ESadek-MO ESadek-MO deleted the FEATURE_load_policy branch October 25, 2024 12:01
HGWright added a commit to HGWright/iris that referenced this pull request Oct 31, 2024
* upstream/main: (194 commits)
  Restore latest Whats New files.
  [pre-commit.ci] pre-commit autoupdate (SciTools#6205)
  correct major minor in whatsnew (SciTools#6202)
  What's new updates for v3.11.0rc0 . (SciTools#6201)
  Update CF standard names table. (SciTools#6200)
  Specify meta in dask.array.map_blocks (SciTools#5989)
  added in a vertical rule for surface fields (SciTools#5734)
  Updated environment lockfiles (SciTools#6197)
  Reduce duplication in cf.py spanning checks. (SciTools#6196)
  Fix attribute array comparison (SciTools#6181)
  Enable factory references to create new dimensions on load. (SciTools#6168) (SciTools#6194)
  Improve handling of masks in concatenate (SciTools#6187)
  Demo Numpy v2 (SciTools#6035)
  Bump scitools/workflows from 2024.10.1 to 2024.10.2 (SciTools#6186)
  Document use of new_axis to control merge (SciTools#6180)
  Updated environment lockfiles (SciTools#6184)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6175)
  Updated environment lockfiles (SciTools#6183)
  Update to `cell_method` parsing (SciTools#6083)
  Bump scitools/workflows from 2024.10.0 to 2024.10.1 (SciTools#6179)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

Investigate automatically detecting time dimensions in hybrid heights
3 participants