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

feat: add deep merging for lists #1082

Merged
merged 26 commits into from
Jul 2, 2023
Merged

feat: add deep merging for lists #1082

merged 26 commits into from
Jul 2, 2023

Commits on May 24, 2023

  1. feat(merging): introduce parameter extend lists

    @MatteoVoges
    MatteoVoges committed May 24, 2023
    Configuration menu
    Copy the full SHA
    1764d1e View commit details
    Browse the repository at this point in the history

  2. feat(merging): add correct behavior for duplicates

    @MatteoVoges
    MatteoVoges committed May 24, 2023
    Configuration menu
    Copy the full SHA
    025cb01 View commit details
    Browse the repository at this point in the history

  3. tests(merging): add tests for deep list merging

    @MatteoVoges
    MatteoVoges committed May 24, 2023
    Configuration menu
    Copy the full SHA
    f00c0d5 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. docs: add news entry for list merging

    @MatteoVoges
    MatteoVoges committed May 25, 2023
    Configuration menu
    Copy the full SHA
    9e2af8e View commit details
    Browse the repository at this point in the history

  2. docs: add example and usage to docs

    @MatteoVoges
    MatteoVoges committed May 25, 2023
    Configuration menu
    Copy the full SHA
    1a581cc View commit details
    Browse the repository at this point in the history

  3. docs: add example to jupyter notebook

    @MatteoVoges
    MatteoVoges committed May 25, 2023
    Configuration menu
    Copy the full SHA
    9dba45d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Omry Yadan <omry@yadan.net>
Co-authored-by: Shagun Sodhani <1321193+shagunsodhani@users.noreply.github.com>
Co-authored-by: Jasha Sommer-Simpson <8935917+Jasha10@users.noreply.github.com>
    @MatteoVoges @omry
    @shagunsodhani @Jasha10
    4 people committed May 31, 2023
    Configuration menu
    Copy the full SHA
    abec5fe View commit details
    Browse the repository at this point in the history

  2. docs: update news entry from suggestion

    @MatteoVoges
    MatteoVoges committed May 31, 2023
    Configuration menu
    Copy the full SHA
    d68a2e4 View commit details
    Browse the repository at this point in the history

  3. refactor: change symbol to remove_duplicates

    @MatteoVoges
    MatteoVoges committed May 31, 2023
    Configuration menu
    Copy the full SHA
    daf6530 View commit details
    Browse the repository at this point in the history

  4. docs: update docs with new name of flag: remove_duplicates

    @MatteoVoges
    MatteoVoges committed May 31, 2023
    Configuration menu
    Copy the full SHA
    3724edb View commit details
    Browse the repository at this point in the history

  5. refactor: remove unneccessary comment

    @MatteoVoges
    MatteoVoges committed May 31, 2023
    Configuration menu
    Copy the full SHA
    5cb9e01 View commit details
    Browse the repository at this point in the history

  6. tests: update testcase to multiple duplicates

    @MatteoVoges
    MatteoVoges committed May 31, 2023
    Configuration menu
    Copy the full SHA
    ac5c75d View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Merge branch 'omry:master' into 1080-add-list-deep-merging

    @MatteoVoges
    MatteoVoges committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    4ec86ce View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. refactor: change interface to using merge mode

    @MatteoVoges
    MatteoVoges committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    dd3c069 View commit details
    Browse the repository at this point in the history

  2. refactor: adapt tests to new interface

    @MatteoVoges
    MatteoVoges committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    107383e View commit details
    Browse the repository at this point in the history

  3. docs: change interface in docs

    @MatteoVoges
    MatteoVoges committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    2460aac View commit details
    Browse the repository at this point in the history

  4. fix: fix formatting in tests

    @MatteoVoges
    MatteoVoges committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    7b61c53 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. refactor: replace literals with enum ListMergeMode

    @MatteoVoges
    MatteoVoges committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    6397853 View commit details
    Browse the repository at this point in the history

  2. docs: add hint for importing in usage.rst

    @MatteoVoges
    MatteoVoges committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    485403a View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. docs: apply suggestions in docs 

    Co-authored-by: Omry Yadan <omry@yadan.net>
    @MatteoVoges @omry
    MatteoVoges and omry committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    fe60429 View commit details
    Browse the repository at this point in the history

  2. fix: remove unused mypy ignore-tag

    @MatteoVoges
    MatteoVoges committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    517eb80 View commit details
    Browse the repository at this point in the history

  3. refactor: change enum keys to suggestion

    @MatteoVoges
    MatteoVoges committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    5d2df8f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'remove-unused-ignore' into 1080-add-list-deep-merging

    @MatteoVoges
    MatteoVoges committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    e951430 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. refactor: rename enum keys again

    @MatteoVoges
    MatteoVoges committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    83a673e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into 1080-add-list-deep-… 

    …merging
    @MatteoVoges
    MatteoVoges committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    539e0e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. docs: fix typo in news

    @MatteoVoges
    MatteoVoges committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    1889e3d View commit details
    Browse the repository at this point in the history