Skip to content

TST/CLN: follow-up to #24750 #24810

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

Merged
jreback merged 1 commit into from
Jan 17, 2019
Merged

TST/CLN: follow-up to #24750 #24810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions pandas/tests/series/indexing/test_boolean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,28 +160,22 @@ def test_where_unsafe_float(float_dtype):
assert_series_equal(s, expected)


@pytest.mark.parametrize("dtype", [np.int64, np.float64])
def test_where_unsafe_upcast(dtype):
s = Series(np.arange(10), dtype=dtype)
values = [2.5, 3.5, 4.5, 5.5, 6.5]

mask = s < 5
expected = Series(values + lrange(5, 10), dtype="float64")

s[mask] = values
assert_series_equal(s, expected)


@pytest.mark.parametrize("dtype", [
np.int8, np.int16, np.int32, np.float32
@pytest.mark.parametrize("dtype,expected_dtype", [
(np.int8, np.float64),
(np.int16, np.float64),
(np.int32, np.float64),
(np.int64, np.float64),
(np.float32, np.float32),
(np.float64, np.float64)
])
def test_where_upcast(dtype):
def test_where_unsafe_upcast(dtype, expected_dtype):
# see gh-9743
s = Series(np.arange(10), dtype=dtype)
mask = s < 5

values = [2.5, 3.5, 4.5, 5.5, 6.5]
mask = s < 5
expected = Series(values + lrange(5, 10), dtype=expected_dtype)
s[mask] = values
assert_series_equal(s, expected)


def test_where_unsafe():
Expand Down