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

BUG: right merge not preserve row order (#27453) #27762

Closed
wants to merge 24 commits into from
Closed

BUG: right merge not preserve row order (#27453) #27762

wants to merge 24 commits into from

Commits on Jan 1, 2020

  1. add failing test to check row order preservation

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    c3565c7 View commit details
    Browse the repository at this point in the history

  2. correct the imports

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    0e481a7 View commit details
    Browse the repository at this point in the history

  3. change order of args in test assertion

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    42eaad1 View commit details
    Browse the repository at this point in the history

  4. broken commit with a bunch of print statements and comments

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    3bba941 View commit details
    Browse the repository at this point in the history

  5. add test for left merge

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    803243c View commit details
    Browse the repository at this point in the history

  6. swap left and right keys when how == "right"

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    cc269f3 View commit details
    Browse the repository at this point in the history

  7. correct old test: right-merge row order is now the same as the right df

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    f2249df View commit details
    Browse the repository at this point in the history

  8. clean up spacing and delete temp code

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    5f728a4 View commit details
    Browse the repository at this point in the history

  9. add whatsnew

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    7ccebb2 View commit details
    Browse the repository at this point in the history

  10. replace .from_records with default constructor

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    90984e4 View commit details
    Browse the repository at this point in the history

  11. add GH issue # to tests

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    de44eae View commit details
    Browse the repository at this point in the history

  12. revert commit ed54bec

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    a8954fe View commit details
    Browse the repository at this point in the history

  13. change logic to swap left and right if how==right

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    d328470 View commit details
    Browse the repository at this point in the history

  14. clean formatting

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    3c1a7cb View commit details
    Browse the repository at this point in the history

  15. rename vars and add comment for clarity

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    7fc6441 View commit details
    Browse the repository at this point in the history

  16. combine tests into one

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    1e9df2b View commit details
    Browse the repository at this point in the history

  17. update whatsnew

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    d017bd5 View commit details
    Browse the repository at this point in the history

  18. Update doc/source/whatsnew/v1.0.0.rst 

    Co-Authored-By: William Ayd <william.ayd@icloud.com>
    @WillAyd
    Nico Cernek and WillAyd committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    71736b8 View commit details
    Browse the repository at this point in the history

  19. add before and after examples

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    11ec7d0 View commit details
    Browse the repository at this point in the history

  20. linting

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    c238b50 View commit details
    Browse the repository at this point in the history

  21. cleanup

    Nico Cernek committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    e29ed1c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2020

  1. changes requested by jreback

    Nico Cernek committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    2b1b675 View commit details
    Browse the repository at this point in the history

  2. update docs

    Nico Cernek committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    ef14ba0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 27453-right-merge-order

    Nico Cernek authored Jan 23, 2020
    Configuration menu
    Copy the full SHA
    978f91f View commit details
    Browse the repository at this point in the history