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

also apply combine_attrs to the attrs of the variables #4902

Merged
merged 31 commits into from
May 5, 2021
Merged

also apply combine_attrs to the attrs of the variables #4902

merged 31 commits into from
May 5, 2021

Commits on Feb 12, 2021

  1. enable the tests

    @keewis
    keewis committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    28b857e View commit details
    Browse the repository at this point in the history

  2. clear all attrs first

    @keewis
    keewis committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    4ab0013 View commit details
    Browse the repository at this point in the history

  3. implement the merging of variable attrs when merging

    @keewis
    keewis committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    c53c71a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into variable-combine_attrs

    @keewis
    keewis committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    df8354b View commit details
    Browse the repository at this point in the history

  5. implement the merging of variable attrs when concatenating

    @keewis
    keewis committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    a0a2265 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2021

  1. add tests for combine_attrs on variables with combine_*

    @keewis
    keewis committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    9af2c3f View commit details
    Browse the repository at this point in the history

  2. modify tests in test_combine which have wrong expectation about attrs

    @keewis
    keewis committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    78f9ef9 View commit details
    Browse the repository at this point in the history

  3. move the attrs preserving into the try / except

    @keewis
    keewis committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    77d0208 View commit details
    Browse the repository at this point in the history

  4. clear variable attrs where necessary

    @keewis
    keewis committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    b234ddf View commit details
    Browse the repository at this point in the history

  5. rewrite the main object merge_attrs tests

    @keewis
    keewis committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    0cbf1a4 View commit details
    Browse the repository at this point in the history

  6. clear the variable attrs first

    @keewis
    keewis committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    71d605a View commit details
    Browse the repository at this point in the history

  7. add combine_attrs="no_conflict"

    @keewis
    keewis committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    fb1fcb9 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. Merge branch 'master' into variable-combine_attrs

    @keewis
    keewis committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    dad9c38 View commit details
    Browse the repository at this point in the history

  2. add a entry to whats-new.rst

    @keewis
    keewis committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    3ee536d View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2021

  1. Merge branch 'master' into variable-combine_attrs

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

Commits on Apr 3, 2021

  1. Merge branch 'master' into variable-combine_attrs

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

Commits on Apr 19, 2021

  1. Update doc/whats-new.rst 

    Co-authored-by: Deepak Cherian <dcherian@users.noreply.github.com>
    @keewis @dcherian
    keewis and dcherian authored Apr 19, 2021
    Configuration menu
    Copy the full SHA
    abacdc9 View commit details
    Browse the repository at this point in the history

  2. dedent a hidden test

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

  3. fix whats-new.rst

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

Commits on Apr 20, 2021

  1. conditionally exclude attrs

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

  2. use add_attrs=False or construct manually instead of clearing attrs

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

  3. also merge attrs for indexed variables

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

  4. use pytest.raises instead of raises_regex

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

  5. Merge branch 'master' into variable-combine_attrs

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

Commits on Apr 29, 2021

  1. switch the default for merge's combine_attrs to override

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

  2. Merge branch 'master' into variable-combine_attrs

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

  3. use pytest.raises

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

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

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

Commits on May 1, 2021

  1. fix whats-new.rst [skip-ci]

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

Commits on May 5, 2021

  1. Merge branch 'master' into variable-combine_attrs

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

  2. provide more context for the change of the default value [skip-ci]

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