Skip to content

CLN: a couple of minor cleanups #40567

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
simonjayhawkins merged 3 commits into from
Mar 22, 2021
Merged

CLN: a couple of minor cleanups #40567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eff4601
redundant comment
simonjayhawkins Mar 8, 2021
e44d27a
import ensure_platform_int from pandas.core.dtypes.common
simonjayhawkins Mar 8, 2021
ab2c69e
Merge remote-tracking branch 'upstream/master' into misc
simonjayhawkins Mar 22, 2021
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
3 changes: 2 additions & 1 deletion pandas/core/arrays/categorical.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from pandas.core.dtypes.common import (
ensure_int64,
ensure_object,
ensure_platform_int,
is_categorical_dtype,
is_datetime64_dtype,
is_dict_like,
Expand Down Expand Up @@ -533,7 +534,7 @@ def astype(self, dtype: Dtype, copy: bool = True) -> ArrayLike:
# error: Incompatible types in assignment (expression has type "ndarray",
# variable has type "Categorical")
result = take_nd( # type: ignore[assignment]
new_cats, libalgos.ensure_platform_int(self._codes)
new_cats, ensure_platform_int(self._codes)
)

return result
Expand Down
2 changes: 0 additions & 2 deletions pandas/tests/apply/test_frame_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,6 @@ def test_transform_method_name(method):
frame_kernels_raise = [x for x in frame_transform_kernels if x not in wont_fail]


# mypy doesn't allow adding lists of different types
# https://github.com/python/mypy/issues/5492
@pytest.mark.parametrize("op", [*frame_kernels_raise, lambda x: x + 1])
def test_transform_bad_dtype(op, frame_or_series):
# GH 35964
Expand Down