Skip to content

Commit

Permalink
[BUG] pandas 1.5.x _MergeOperation doesn't have copy keyword anym…
Browse files Browse the repository at this point in the history
…ore (#1175)

* [BUG] pandas 1.5.x `_MergeOperation` doesn't have `copy` keyword anymore

* Compat window system

window can't figure out the different between int32 and int64

* Update CHANGELOG.md
  • Loading branch information
Zeroto521 authored Oct 19, 2022
1 parent 352977c commit f0c7906
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
- [ENH] The parameter `column_name` of `change_type` totally supports inputing multi-column now. #1163 @Zeroto521
- [ENH] Fix error when `sort_by_appearance=True` is combined with `dropna=True`. Issue #1168 @samukweku
- [ENH] Add explicit default parameter to `case_when` function. Issue #1159 @samukweku

- [BUG] pandas 1.5.x `_MergeOperation` doesn't have `copy` keyword anymore. Issue #1174 @Zeroto521

## [v0.23.1] - 2022-05-03

Expand Down
1 change: 0 additions & 1 deletion janitor/functions/conditional_join.py
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,6 @@ def _multiple_conditional_join_eq(
left_on=left_on,
right_on=right_on,
sort=False,
copy=False,
)._get_join_indexers()

if not left_index.size:
Expand Down
2 changes: 1 addition & 1 deletion tests/functions/test_case_when.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def test_case_when_default_array(df):
)
expected = np.where(df.numbers > 1, df.numbers + 10, default)
expected = df.assign(bleh=expected)
assert_frame_equal(result, expected)
assert_frame_equal(result, expected, check_dtype=False)


@given(df=categoricaldf_strategy())
Expand Down

0 comments on commit f0c7906

Please sign in to comment.