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

Merge Index and Series binops #8166

Merged
merged 35 commits into from
May 6, 2021
Merged

Merge Index and Series binops #8166

merged 35 commits into from
May 6, 2021

Commits on May 3, 2021

  1. Rename Series._binaryop to _apply_op for consistency with DataFrame.

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

  2. Simplify logic for DataFrame-Series binaryop.

    @vyasr
    vyasr committed May 3, 2021
    Configuration menu
    Copy the full SHA
    252c9e1 View commit details
    Browse the repository at this point in the history

  3. Minor simplifications.

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

  4. Simplify construction of result columns list.

    @vyasr
    vyasr committed May 3, 2021
    Configuration menu
    Copy the full SHA
    9c0dc53 View commit details
    Browse the repository at this point in the history

  5. Revert "Rename Series._binaryop to _apply_op for consistency with Dat… 

    …aFrame."

This reverts commit a49f3748c7d19fa39181df05549c7a7dcced4a9a.
    @vyasr
    vyasr committed May 3, 2021
    Configuration menu
    Copy the full SHA
    19f1b69 View commit details
    Browse the repository at this point in the history

  6. Simplify null handling logic in binops.

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

  7. More simplifications.

    @vyasr
    vyasr committed May 3, 2021
    Configuration menu
    Copy the full SHA
    00dffb5 View commit details
    Browse the repository at this point in the history

  8. Move copy construct from series to frame.

    @vyasr
    vyasr committed May 3, 2021
    Configuration menu
    Copy the full SHA
    5cae0a4 View commit details
    Browse the repository at this point in the history

  9. Add trivial internal method for index non-reflective binary ops (curr… 

    …ently still a pass-through to Series).
    @vyasr
    vyasr committed May 3, 2021
    Configuration menu
    Copy the full SHA
    ddebce6 View commit details
    Browse the repository at this point in the history

  10. Initial version of binary op for index.

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

  11. Revert dataframe changes (restricting this PR to index and series only).

    @vyasr
    vyasr committed May 3, 2021
    Configuration menu
    Copy the full SHA
    8216e6c View commit details
    Browse the repository at this point in the history

  12. Basic working implementation of index binops.

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

Commits on May 4, 2021

  1. Add tests for binary operations.

    @vyasr
    vyasr committed May 4, 2021
    Configuration menu
    Copy the full SHA
    946f6b1 View commit details
    Browse the repository at this point in the history

  2. Centralize tests for index and series.

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

  3. Add reflected ops.

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

  4. Enable null filling.

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

  5. Move most binary operations to SingleColumnFrame.

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

  6. Move binaryop implementation to SingleColumnFrame.

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

  7. Reintroduce old null handling temporarily.

    @vyasr
    vyasr committed May 4, 2021
    Configuration menu
    Copy the full SHA
    829df17 View commit details
    Browse the repository at this point in the history

  8. Override copy_construct for index to support returning a different in… 

    …dex type.
    @vyasr
    vyasr committed May 4, 2021
    Configuration menu
    Copy the full SHA
    f2da7e1 View commit details
    Browse the repository at this point in the history

  9. Fix behavior for bool and categorical dtype indices.

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

  10. Move copy construct.

    @vyasr
    vyasr committed May 4, 2021
    Configuration menu
    Copy the full SHA
    522ee42 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2021

  1. Simplify the behavior for null filling again.

    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    64f92a6 View commit details
    Browse the repository at this point in the history

  2. Remove now redundant tests.

    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    971ed93 View commit details
    Browse the repository at this point in the history

  3. Handle various index dtypes correctly.

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

  4. Handle correct types for RangeIndex binops.

    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    2274af6 View commit details
    Browse the repository at this point in the history

  5. Fix kwargs for GenericIndex.

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

  6. Centralize _normalize_binop_value.

    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    6d07e15 View commit details
    Browse the repository at this point in the history

  7. Move bitwise binops to frame so indexes can use directly.

    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    16aa1f8 View commit details
    Browse the repository at this point in the history

  8. Move many more operators to SingleColumnFrame so they work on Index a… 

    …s well.
    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    12827ad View commit details
    Browse the repository at this point in the history

  9. Remove Index._apply_op entirely.

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

  10. First pass at addressing PR comments.

    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    8a26869 View commit details
    Browse the repository at this point in the history

  11. Use binop on column to avoid expensive isnull.

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

  12. Switch string truediv types to dtypes.

    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    15e9458 View commit details
    Browse the repository at this point in the history

  13. Error gracefully on attempts to perform bitwise binops with extension… 

    … dtypes.
    @vyasr
    vyasr committed May 5, 2021
    Configuration menu
    Copy the full SHA
    a930a11 View commit details
    Browse the repository at this point in the history