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.

Sign up for GitHub

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

Jump to bottom

Coarsen keep attrs 3376 #3801

Merged
merged 18 commits into from
Mar 2, 2020
Merged

Coarsen keep attrs 3376 #3801

merged 18 commits into from
Mar 2, 2020

Commits on Feb 26, 2020

  1. Add test of DataWithCoords.coarsen() for pydata#3376

    @amcnicho
    amcnicho committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    dc6ca01 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2020

  1. Add test of Variable.coarsen() for pydata#3376

    @amcnicho
    amcnicho committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    cb1e6c4 View commit details
    Browse the repository at this point in the history

  2. Add keep_attrs kwarg to DataWithCoords.coarsen() for pydata#3376

    @amcnicho
    amcnicho committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    ade6a49 View commit details
    Browse the repository at this point in the history

  3. Style and spelling fixes (pydata#3376)

    @amcnicho
    amcnicho committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    523cca4 View commit details
    Browse the repository at this point in the history

  4. Fix test_coarsen_keep_attrs by removing self from input

    @amcnicho
    amcnicho committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    5113bf3 View commit details
    Browse the repository at this point in the history

  5. Pass keep_attrs through to _coarsen_cls and _rolling_cls returns (pyd… 

    …ata#3376)
    @amcnicho
    amcnicho committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    df1b0dc View commit details
    Browse the repository at this point in the history

  6. Move keyword from coarsen to mean in test_coarsen_keep_attrs

    @amcnicho
    amcnicho committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    af7bd10 View commit details
    Browse the repository at this point in the history

  7. Start handling keep_attrs in rolling class constructors (pydata#3376)

    @amcnicho
    amcnicho committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    4a45840 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2020

  1. Update Coarsen constructor and DatasetCoarsen class method (GH3376) 

    Assign keep_attrs keyword value to Coarsen objects in constructor
Add conditional inside _reduce_method.wrapped_func branching on self.keep_attrs and pass back to returned Dataset
    @amcnicho
    amcnicho committed Feb 28, 2020
    Configuration menu
    Copy the full SHA
    28f705f View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2020

  1. Incorporate code review from @max-sixty

    @amcnicho
    amcnicho committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    2c61115 View commit details
    Browse the repository at this point in the history

  2. Fix Dataset.coarsen and Variable.coarsen for GH3376 

    Handle global keep_attrs setting inside Variable._coarsen_reshape

Pass attrs through consistently inside DatasetCoarsen._reduce_method

Don't pass Variable.coarsen a keyword argument it doesn't expect inside DataArrayCoarsen._reduce_method
    @amcnicho
    amcnicho committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    e05ca96 View commit details
    Browse the repository at this point in the history

  3. Update tests for GH3376

    @amcnicho
    amcnicho committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    d326404 View commit details
    Browse the repository at this point in the history

  4. Incorporate review changes to test_dataset for GH3376 

    Remove commented-out test from test_coarsen_keep_attrs

Add test_rolling_keep_attrs
    @amcnicho
    amcnicho committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    735dc5a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into coarsen-keep_attrs-3376

    @amcnicho
    amcnicho committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    cd43608 View commit details
    Browse the repository at this point in the history

  6. Change Rolling._dataset_implementation for GH3376 

    Return a Dataset object that results in test_rolling_keep_attrs Passing
    @amcnicho
    amcnicho committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    496838c View commit details
    Browse the repository at this point in the history

  7. style fixes

    @amcnicho
    amcnicho committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    975a796 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2020

  1. Remove duplicate variable assignment and document change (GH3776)

    @amcnicho
    amcnicho committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    98edaa8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into coarsen-keep_attrs-3376 to resolve doc/wha… 

    …ts-new.rst conflict
    @amcnicho
    amcnicho committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    4968c44 View commit details
    Browse the repository at this point in the history