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

support passing a function to combine_attrs #4896

Merged
merged 17 commits into from
Jun 8, 2021
Merged

support passing a function to combine_attrs #4896

merged 17 commits into from
Jun 8, 2021

Commits on Feb 6, 2021

  1. add a test for passing a function to merge_attrs

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

Commits on Feb 11, 2021

  1. support a callable combine_attrs

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

  2. Merge branch 'master' into callable-combine_attrs

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

  3. also check that callable combine_attrs works with variables

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

  4. update the docstrings of merge, concat and combine_*

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

  5. also test the other functions that support combine_attrs

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

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

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

Commits on May 17, 2021

  1. add a context kwarg which will be None for now

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

  2. Merge branch 'master' into callable-combine_attrs

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

  3. fix the bad merge [skip-ci]

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

  4. fix the merge and combine tests

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

  5. fix the concat tests

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

Commits on May 26, 2021

  1. update the docs to account for the context object

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

  2. expose Context as part of the public API

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

Commits on Jun 8, 2021

  1. Merge branch 'master' into callable-combine_attrs

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

  2. move to the newest section

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

  3. fix whats-new.rst

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