Skip to content

Fixes #55884- Added else for invalid fill_method #55927

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
Merged
merged 11 commits into from
Nov 14, 2023
Merged

Fixes #55884- Added else for invalid fill_method #55927

merged 11 commits into from
Nov 14, 2023

Conversation

@ziadk
Copy link
Contributor

@ziadk ziadk commented Nov 12, 2023

@ziadk
Copy link
Contributor Author

ziadk commented Nov 12, 2023

@lithomas1 could you please review this ^^? Thanks a lot !

mroeschke
mroeschke reviewed Nov 13, 2023
View reviewed changes
mroeschke
mroeschke reviewed Nov 13, 2023
View reviewed changes
mroeschke
mroeschke reviewed Nov 13, 2023
View reviewed changes
mroeschke
mroeschke reviewed Nov 13, 2023
View reviewed changes
mroeschke
mroeschke reviewed Nov 13, 2023
View reviewed changes
@mroeschke mroeschke added Reshaping Concat, Merge/Join, Stack/Unstack, Explode Error Reporting Incorrect or improved errors from pandas labels Nov 13, 2023
ziad-kermadi and others added 5 commits November 13, 2023 21:02
@ziad-kermadi @mroeschke
Update pandas/tests/reshape/merge/test_merge_ordered.py
36b1c25 
Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
@ziad-kermadi @mroeschke
Update pandas/tests/reshape/merge/test_merge_ordered.py
534521e 
Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
@ziad-kermadi @mroeschke
Update pandas/core/reshape/merge.py
dd54596 
Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
@ziad-kermadi
Fixed mergeordered ValueError Message
c9feabc
@ziad-kermadi
Use pytest fixtures & parametrize for tests
4e003ac
@ziadk
Copy link
Contributor Author

ziadk commented Nov 13, 2023

@mroeschke All suggestions were implemented. Thanks a lot for the guidance. This was very instructive !

@ziadk ziadk requested a review from mroeschke November 13, 2023 20:58
@mroeschke mroeschke added this to the 2.2 milestone Nov 14, 2023
@mroeschke mroeschke merged commit 112fd0b into pandas-dev:main Nov 14, 2023
@mroeschke
Copy link
Member

mroeschke commented Nov 14, 2023

Thanks @ziadk

@ziadk ziadk deleted the merge_ordered_validation branch November 14, 2023 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mroeschke mroeschke mroeschke approved these changes

Assignees

No one assigned

Labels

Error Reporting Incorrect or improved errors from pandas Reshaping Concat, Merge/Join, Stack/Unstack, Explode

Projects

None yet

Milestone

2.2

Development

Successfully merging this pull request may close these issues.

merge_ordered() doesn't validate fill_method

3 participants

@ziadk @mroeschke @ziad-kermadi