Skip to content
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

TST: add test coverage for maybe_promote #23982

Merged
merged 11 commits into from
Oct 11, 2019
+10 −0
Merged

TST: add test coverage for maybe_promote #23982

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c79901f
TST: add test coverage for maybe_promote
h-vetinari Feb 24, 2019
abbce54
Fix PY2
h-vetinari Feb 24, 2019
07e3b0c
Fix skip syntax
h-vetinari Feb 24, 2019
a9516ec
blackify conflict files before merge
h-vetinari Sep 21, 2019
297172c
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote
h-vetinari Sep 22, 2019
05a4889
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote
h-vetinari Oct 8, 2019
0c5b524
reduce diff with master and skip some more tests
h-vetinari Oct 8, 2019
6ca1f8f
lint
h-vetinari Oct 8, 2019
0eb4ffa
remove spurious 'pass', and re-enable corresponding tests
h-vetinari Oct 8, 2019
acbef3e
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote
h-vetinari Oct 11, 2019
46c8277
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote
h-vetinari Oct 11, 2019
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
10 changes: 10 additions & 0 deletions pandas/tests/dtypes/cast/test_promote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,16 @@ def test_maybe_promote_bytes_with_any(bytes_dtype, any_numpy_dtype_reduced, box)
)


# override parametrization of box to add special case for bytes
@pytest.mark.parametrize(
"box",
[
(True, None), # fill_value wrapped in array with auto-dtype (fixed len)
(True, "bytes"), # fill_value wrapped in array with generic bytes-dtype
(True, object), # fill_value wrapped in array with object dtype
(False, None), # fill_value directly
],
)
def test_maybe_promote_any_with_bytes(any_numpy_dtype_reduced, bytes_dtype, box):
dtype = np.dtype(any_numpy_dtype_reduced)
fill_dtype = np.dtype(bytes_dtype)
Expand Down