Merge branch 'pyjanitor-devs:dev' into ci/testing-env

Zeroto521 · web-flow · commit bd99a1aacfe8 · 2022-10-19T19:31:23.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 
diff --git a/janitor/functions/conditional_join.py b/janitor/functions/conditional_join.py
@@ -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:
diff --git a/tests/functions/test_case_when.py b/tests/functions/test_case_when.py
@@ -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())

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ def test_case_when_default_array(df):`
`175`	`175`	`)`
`176`	`176`	`expected = np.where(df.numbers > 1, df.numbers + 10, default)`
`177`	`177`	`expected = df.assign(bleh=expected)`
`178`		`- assert_frame_equal(result, expected)`
	`178`	`+ assert_frame_equal(result, expected, check_dtype=False)`
`179`	`179`
`180`	`180`
`181`	`181`	`@given(df=categoricaldf_strategy())`