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

combine keep_attrs and combine_attrs in apply_ufunc #5041

Merged
merged 22 commits into from
May 13, 2021
Merged

combine keep_attrs and combine_attrs in apply_ufunc #5041

merged 22 commits into from
May 13, 2021

Commits on Mar 15, 2021

  1. add tests for most keep_attrs values for apply_ufunc for variables

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    35c1b5b View commit details
    Browse the repository at this point in the history

  2. implement keep_attrs for apply_variable_ufunc

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    c13b080 View commit details
    Browse the repository at this point in the history

  3. move the keep_attrs preprocessing to apply_ufunc

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    2ee7076 View commit details
    Browse the repository at this point in the history

  4. implement keep_attrs for DataArray objects

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    68e09ec View commit details
    Browse the repository at this point in the history

  5. implement keep_attrs for Dataset

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    b0a3054 View commit details
    Browse the repository at this point in the history

  6. don't include the definition of the assert func in the traceback

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    da1a239 View commit details
    Browse the repository at this point in the history

  7. check that keep_attrs is applied recursively

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    92d6ce5 View commit details
    Browse the repository at this point in the history

  8. skip the recursion tests

    @keewis
    keewis committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    8fccdd1 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2021

  1. don't skip the variable tests

    @keewis
    keewis committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    5a16add View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into keep_attrs

    @keewis
    keewis committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    373fcf3 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Merge branch 'master' into keep_attrs

    @keewis
    keewis committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    c995d65 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2021

  1. Merge branch 'master' into keep_attrs

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    fdb7ff3 View commit details
    Browse the repository at this point in the history

  2. add a combine_attrs parameter to merge_coordinates_without_align

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    d95cdf1 View commit details
    Browse the repository at this point in the history

  3. propagate keep_attrs

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    6cdfd09 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into keep_attrs

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    8e23728 View commit details
    Browse the repository at this point in the history

  5. update whats-new.rst [skip-ci]

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    a38dffb View commit details
    Browse the repository at this point in the history

Commits on May 8, 2021

  1. Merge branch 'master' into keep_attrs

    @keewis
    keewis committed May 8, 2021
    Configuration menu
    Copy the full SHA
    085052b View commit details
    Browse the repository at this point in the history

  2. change the default

    @keewis
    keewis committed May 8, 2021
    Configuration menu
    Copy the full SHA
    b257ad7 View commit details
    Browse the repository at this point in the history

  3. change the default values to make sure keep_attrs is always a str

    @keewis
    keewis committed May 8, 2021
    Configuration menu
    Copy the full SHA
    bef9064 View commit details
    Browse the repository at this point in the history

  4. test data, dims and coords separately

    @keewis
    keewis committed May 8, 2021
    Configuration menu
    Copy the full SHA
    9c07044 View commit details
    Browse the repository at this point in the history

  5. move the whats-new.rst entry [skip-ci]

    @keewis
    keewis committed May 8, 2021
    Configuration menu
    Copy the full SHA
    551b77b View commit details
    Browse the repository at this point in the history

Commits on May 13, 2021

  1. Merge branch 'master' into keep_attrs

    @dcherian
    dcherian authored May 13, 2021
    Configuration menu
    Copy the full SHA
    616f7e9 View commit details
    Browse the repository at this point in the history