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

New recursive diff master #55759

Merged
merged 10 commits into from
Jan 4, 2020
Merged

New recursive diff master #55759

merged 10 commits into from
Jan 4, 2020

Commits on Dec 30, 2019

  1. salt/utils/data.py: Added recursive diff that can diff any mapping or… 

    … iterable recursively. Also added unittests.
    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    d32b843 View commit details
    Browse the repository at this point in the history

  2. salt/utils/data.py: Remove debug print.

    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    269cb34 View commit details
    Browse the repository at this point in the history

  3. salt/utils/data.py: Updated docstring for recursive_diff.

    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    f49354e View commit details
    Browse the repository at this point in the history

  4. Added ignore_missing_keys parameter to recursive_diff. 

    This will make it more compatible with the existing dictdiffer.
Also added tests for the new parameter.
    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    bea90a3 View commit details
    Browse the repository at this point in the history

  5. Renamed ignore_* parameters for recursive_diff to be more clear. 

    Updated and added unittests to match.
    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    a277e87 View commit details
    Browse the repository at this point in the history

  6. Remove (failing) json_query test 

    Also remove FilterFalseyTestCase class as this is part of another PR
    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    29faab6 View commit details
    Browse the repository at this point in the history

  7. Restore missing tests that got dropped during rebasing

    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    7005cf7 View commit details
    Browse the repository at this point in the history

  8. Apply pylint-inspired changes: 

    Remove is_iterable as it is already implemented in is_iter;
Replaced all elif after return with if;
Remove else after return or continue;
Added function docstrings where they were missing.
    @github-abcde
    github-abcde committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    a88400b View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2019

  1. Merge branch 'master' into new_recursive_diff-master

    @github-abcde
    github-abcde authored Dec 31, 2019
    Configuration menu
    Copy the full SHA
    de968b4 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. Merge branch 'master' into new_recursive_diff-master

    @github-abcde
    github-abcde authored Jan 3, 2020
    Configuration menu
    Copy the full SHA
    74d4ca1 View commit details
    Browse the repository at this point in the history