Skip to content

TST: un-xfail 1 passing maybe_promote test #28850

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
merged 21 commits into from
Oct 8, 2019
Merged

TST: un-xfail 1 passing maybe_promote test #28850

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d635620
TST: More maybe_promote xfails
jbrockmendel Oct 2, 2019
677825b
cleanup
jbrockmendel Oct 2, 2019
ac2cb87
trim xfail cases
jbrockmendel Oct 2, 2019
7137dda
cleanup
jbrockmendel Oct 2, 2019
5ac4da5
cleanup box xfails
jbrockmendel Oct 2, 2019
7fe25bc
clean up not-boxed xfails
jbrockmendel Oct 2, 2019
66a1176
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 2, 2019
c9f8628
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 3, 2019
44a6162
DEPR: Deprecate Index.set_value (#28621)
topper-123 Oct 3, 2019
624dc21
CLN: Centralised _check_percentile (#27584)
hedonhermdev Oct 3, 2019
0bf8296
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 3, 2019
b209aef
remove iNaT case
jbrockmendel Oct 3, 2019
c718d98
remove another iNaT case
jbrockmendel Oct 3, 2019
11603ad
Fix floatt32 case
jbrockmendel Oct 3, 2019
b829e01
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 3, 2019
8c41bbf
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 6, 2019
fe418c6
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 6, 2019
4c9983d
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 8, 2019
a2451bf
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Oct 8, 2019
947556d
revert
jbrockmendel Oct 8, 2019
b7db096
remove one xfail
jbrockmendel Oct 8, 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
9 changes: 1 addition & 8 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 @@ -1038,14 +1038,7 @@ def test_maybe_promote_any_numpy_dtype_with_na(
dtype = np.dtype(any_numpy_dtype_reduced)
boxed, box_dtype = box # read from parametrized fixture

if (
dtype == bytes
and not boxed
and fill_value is not None
and fill_value is not NaT
):
pytest.xfail("does not upcast to object")
elif is_integer_dtype(dtype) and fill_value is not NaT:
if is_integer_dtype(dtype) and fill_value is not NaT:
# integer + other missing value (np.nan / None) casts to float
expected_dtype = np.float64
exp_val_for_scalar = np.nan
Expand Down