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

Mergeback of FEATURE_chunk_control branch #5588

Merged
merged 8 commits into from
Nov 23, 2023
Merged

Commits on Nov 13, 2023

  1. Merge chunk control code into latest iris (#5565)

    * Dask chunking control for netcdf loading.
    
    * renamed loader
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * fix indentation error, perhaps also docstring error
    
    * fixed result error in loader, and set tests to treat as big files
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * trial and error, solve non iterable tuple 1.0
    
    * trial and error, solve non iterable tuple 2.0 (used if var is none: instead of if var: )
    
    * commented out docstring
    
    * fixed mock 'no name' failure
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * fixed precommit issues
    
    * corrected docstrings as per review comments
    
    * Removed unnecessary line
    
    Co-authored-by: Martin Yeo <[email protected]>
    
    ---------
    
    Co-authored-by: Patrick Peglar <[email protected]>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: Martin Yeo <[email protected]>
    4 people authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    f73f479 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Chunk control modes (#5575)

    * added modes
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * added as_dask mode
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * cleaned up enum and as_dask, as per review comments
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * corrected  to  in final place
    
    * unindented lazy_param assignment one indent
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    ESadek-MO and pre-commit-ci[bot] authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    ef895e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a979fdc View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Chunk Control Tests (#5583)

    * converted tests to pytest, added neg_one, and incomplete from_file and as_dask tests
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * added from_file test
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * added mocking tests
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * trial and error with mocks and patches, may or may not work
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * converted Mock to patch in as_dask test
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * review comment changes
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * pre commit fixes
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * review comments, and added test in test__get_cf_var_data()
    
    * added in another test
    
    * added tests and fixed review comments
    
    * added AuxCoord test
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    ESadek-MO and pre-commit-ci[bot] authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    34571eb View commit details
    Browse the repository at this point in the history
  2. Chunk control minor fixes (#5593)

    * Disallow chunks=None in optimum_chunksize.
    
    * Clearer docstrings.
    
    * Corrected docstring.
    trexfeathers authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    0ca91c3 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Chunk Control documentation (#5597)

    * init PR, skeleton TP
    
    * whoops, missed the TP.
    
    * fixed doctests in rst file
    
    * correct triple chevron to elipses
    
    * updated set doctest to better show functionality
    
    * removed in-progress doctest code
    
    * Review comments, part 1
    
    * Review comments, part 2
    
    * changed numpy docs dict
    
    * wait, this way is better
    
    * fixed linkcheck failures (maybe)
    
    * fixed :meth:
    
    * fixed a couple doc bits
    
    * hopefully fixed doctests
    
    * newest review comments
    
    * fixed rendering, and wording in docstring
    
    * fixed docstring numpyness
    ESadek-MO authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    06d3eaf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    96451ea View commit details
    Browse the repository at this point in the history
  3. What's New Entry (#5601)

    * written whatsnew entry
    
    * added ref
    
    * moved label to before title
    ESadek-MO authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    1aa35b4 View commit details
    Browse the repository at this point in the history