Skip to content

Conversation

Charlie-XIAO
Copy link
Contributor

@Charlie-XIAO Charlie-XIAO commented May 13, 2023

Copy link
Contributor

@topper-123 topper-123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@phofl phofl added the Reshaping Concat, Merge/Join, Stack/Unstack, Explode label May 14, 2023
@phofl phofl added this to the 2.1 milestone May 14, 2023
@mroeschke
Copy link
Member

Could you resolve the merge conflict?

@Charlie-XIAO
Copy link
Contributor Author

Charlie-XIAO commented May 15, 2023

Done. Will fix code style ASAP.

@mroeschke mroeschke merged commit 9190b13 into pandas-dev:main May 16, 2023
@mroeschke
Copy link
Member

Thanks @Charlie-XIAO

Rylie-W pushed a commit to Rylie-W/pandas that referenced this pull request May 19, 2023
…le level (pandas-dev#53215)

* fix merge when MultiIndex with single level

* resolved conversations

* fixed code style
topper-123 pushed a commit to topper-123/pandas that referenced this pull request May 22, 2023
…le level (pandas-dev#53215)

* fix merge when MultiIndex with single level

* resolved conversations

* fixed code style
topper-123 pushed a commit to topper-123/pandas that referenced this pull request May 27, 2023
…le level (pandas-dev#53215)

* fix merge when MultiIndex with single level

* resolved conversations

* fixed code style
@Charlie-XIAO Charlie-XIAO deleted the merge-multiindex-1lv branch June 28, 2023 05:42
Daquisu pushed a commit to Daquisu/pandas that referenced this pull request Jul 8, 2023
…le level (pandas-dev#53215)

* fix merge when MultiIndex with single level

* resolved conversations

* fixed code style
mroeschke pushed a commit that referenced this pull request Jul 13, 2023
* ENH: better dtype inference when doing DataFrame reductions

* precommit issues

* fix failures

* fix failures

* mypy + some docs

* doc linting linting

* refactor to use _reduce_with_wrap

* docstring linting

* pyarrow failure + linting

* pyarrow failure + linting

* linting

* doc stuff

* linting fixes

* fix fix doc string

* remove _wrap_na_result

* doc string example

* pyarrow + categorical

* silence bugs

* silence errors

* silence errors II

* fix errors III

* various fixups

* various fixups

* delay fixing windows and 32bit failures

* BUG: Adding a columns to a Frame with RangeIndex columns using a non-scalar key (#52877)

* DOC: Update whatsnew (#52882)

* CI: Change development python version to 3.10 (#51133)

* CI: Change development python version to 3.10

* Update checks

* Remove strict

* Remove strict

* Fixes

* Add dt

* Switch python to 3.9

* Remove

* Fix

* Try attribute

* Adjust

* Fix mypy

* Try fixing doc build

* Fix mypy

* Fix stubtest

* Remove workflow file

* Rename back

* Update

* Rename

* Rename

* Change python version

* Remove

* Fix doc errors

* Remove pypy

* Update ci/deps/actions-pypy-39.yaml

Co-authored-by: Thomas Li <[email protected]>

* Revert pypy removal

* Remove again

* Fix

* Change to 3.9

* Address

---------

Co-authored-by: Thomas Li <[email protected]>

* update

* update

* add docs

* fix windows tests

* fix windows tests

* remove guards for 32bit linux

* add bool tests + fix 32-bit failures

* fix pre-commit failures

* fix mypy failures

* rename _reduce_with -> _reduce_and_wrap

* assert missing attributes

* reduction dtypes on windows and 32bit systems

* add tests for min_count=0

* PERF:median with axis=1

* median with axis=1 fix

* streamline Block.reduce

* fix comments

* FIX preserve dtype with datetime columns of different resolution when merging (#53213)

* BUG Merge not behaving correctly when having `MultiIndex` with a single level (#53215)

* fix merge when MultiIndex with single level

* resolved conversations

* fixed code style

* BUG: preserve dtype for right/outer merge of datetime with different resolutions (#53233)

* remove special BooleanArray.sum method

* remove BooleanArray.prod

* fixes

* Update doc/source/whatsnew/v2.1.0.rst

Co-authored-by: Joris Van den Bossche <[email protected]>

* Update pandas/core/array_algos/masked_reductions.py

Co-authored-by: Joris Van den Bossche <[email protected]>

* small cleanup

* small cleanup

* only reduce 1d

* fix after #53418

* update according to comments

* revome note

* update _minmax

* REF: add keepdims parameter to ExtensionArray._reduce + remove ExtensionArray._reduce_and_wrap

* REF: add keepdims parameter to ExtensionArray._reduce + remove ExtensionArray._reduce_and_wrap

* fix whatsnew

* fix _reduce call

* simplify test

* add tests for any/all

---------

Co-authored-by: Patrick Hoefler <[email protected]>
Co-authored-by: Thomas Li <[email protected]>
Co-authored-by: Guillaume Lemaitre <[email protected]>
Co-authored-by: Yao Xiao <[email protected]>
Co-authored-by: Joris Van den Bossche <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Reshaping Concat, Merge/Join, Stack/Unstack, Explode
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG: Unexpected Behaviour pd.merge using left_on and right_index=True with single level MultiIndex
4 participants