8000 CLN: Remove/deprecate unused/misleading dtype functions by jbrockmendel · Pull Request #23917 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

CLN: Remove/deprecate unused/misleading dtype functions #23917

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 25 commits into from
Nov 27, 2018
Merged

CLN: Remove/deprecate unused/misleading dtype functions #23917

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
607f853
remove unused maybe_convert_scalar
jbrockmendel Nov 25, 2018
1e95d48
remove unused maybe_convert_string_to_object
jbrockmendel Nov 25, 2018
714c287
remove deprecated is_floating_dtype
jbrockmendel Nov 25, 2018
ba6ef3d
deprecate is_period
jbrockmendel Nov 25, 2018
a983755
deprecate is_datetimetz
jbrockmendel Nov 25, 2018
d7944b6
set stacklevel
jbrockmendel Nov 26, 2018
2c9b406
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Nov 26, 2018
34c4e91
remove unused is_timedelta_array and is_timedelta64_array
jbrockmendel Nov 26, 2018
8e86599
remove is_int_or_datetime_dtype
jbrockmendel Nov 26, 2018
0cf6239
GH reference
jbrockmendel Nov 26, 2018
8adda17
fixup typecheck
jbrockmendel Nov 26, 2018
fe02240
typo fixu[
jbrockmendel Nov 26, 2018
53d1de4
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Nov 26, 2018
e2f8669
Addre 8000 ss comments
jbrockmendel Nov 26, 2018
3daaabf
isort
jbrockmendel Nov 26, 2018
2566a18
dummy commit to force CI
jbrockmendel Nov 26, 2018
8342b97
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Nov 26, 2018
a7f7916
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Nov 27, 2018
6dda1be
separated conditions
jbrockmendel Nov 27, 2018
9c64633
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Nov 27, 2018
3d8752f
docstring fixup
jbrockmendel Nov 27, 2018
bb8a814
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Nov 27, 2018
71483b5
revert usage of needs_i8_conversion
jbrockmendel Nov 27, 2018
e0593bb
dummy commit to force CI
jbrockmendel Nov 27, 2018
5bdc157
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Nov 27, 2018
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
Prev Previous commit
Next Next commit
remove unused is_timedelta_array and is_timedelta64_array
  • Loading branch information
@jbrockmendel
jbrockmendel committed Nov 26, 2018
commit 34c4e91c6d45f218d5ece4b2a1b49a07df2d7e7c
31 changes: 2 additions & 29 deletions pandas/_libs/lib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,25 +1250,19 @@ def infer_dtype(value: object, skipna: bool=False) -> str:
if util.is_datetime64_object(val):
if is_datetime64_array(values):
return 'datetime64'
elif is_timedelta_or_timedelta64_array(values):
return 'timedelta'

elif is_timedelta(val):
if is_timedelta_or_timedelta64_array(values):
return 'timedelta'

elif util.is_integer_object(val):
# a timedelta will show true here as well
if is_timedelta(val):
if is_timedelta_or_timedelta64_array(values):
return 'timedelta'
# numpy timedelta64 objects are caught in the previous branch;
# ordering matters here

if is_integer_array(values):
return 'integer'
elif is_integer_float_array(values):
return 'mixed-integer-float'
elif is_timedelta_or_timedelta64_array(values):
return 'timedelta'
return 'mixed-integer'

elif PyDateTime_Check(val):
Expand Down Expand Up @@ -1701,27 +1695,6 @@ cdef class TimedeltaValidator(TemporalValidator):
return is_null_timedelta64(value)


# TODO: Not used outside of tests; remove?
def is_timedelta_array(values: ndarray) -> bool:
cdef:
TimedeltaValidator validator = TimedeltaValidator(len(values),
skipna=True)
return validator.validate(values)


cdef class Timedelta64Validator(TimedeltaValidator):
cdef inline bint is_value_typed(self, object value) except -1:
return util.is_timedelta64_object(value)


# TODO: Not used outside of tests; remove?
def is_timedelta64_array(values: ndarray) -> bool:
cdef:
Timedelta64Validator validator = Timedelta64Validator(len(values),
skipna=True)
return validator.validate(values)


cdef class AnyTimedeltaValidator(TimedeltaValidator):
cdef inline bint is_value_typed(self, object value) except -1:
return is_timedelta(value)
Expand Down
12 changes: 0 additions & 12 deletions pandas/tests/dtypes/test_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,37 +875,27 @@ def test_is_datetimelike_array_all_nan_nat_like(self):
arr = np.array([np.nan, pd.NaT, np.datetime64('nat')])
assert lib.is_datetime_array(arr)
assert lib.is_datetime64_array(arr)
assert not lib.is_timedelta_array(arr)
assert not lib.is_timedelta64_array(arr)
assert not lib.is_timedelta_or_timedelta64_array(arr)

arr = np.array([np.nan, pd.NaT, np.timedelta64('nat')])
assert not lib.is_datetime_array(arr)
assert not lib.is_datetime64_array(arr)
assert lib.is_timedelta_array(arr)
assert lib.is_timedelta64_array(arr)
assert lib.is_timedelta_or_timedelta64_array(arr)

arr = np.array([np.nan, pd.NaT, np.datetime64('nat'),
np.timedelta64('nat')])
assert not lib.is_datetime_array(arr)
assert not lib.is_datetime64_array(arr)
assert not lib.is_timedelta_array(arr)
assert not lib.is_timedelta64_array(arr)
assert not lib.is_timedelta_or_timedelta64_array(arr)

arr = np.array([np.nan, pd.NaT])
assert lib.is_datetime_array(arr)
assert lib.is_datetime64_array(arr)
assert lib.is_timedelta_array(arr)
assert lib.is_timedelta64_array(arr)
assert lib.is_timedelta_or_timedelta64_array(arr)

arr = np.array([np.nan, np.nan], dtype=object)
assert not lib.is_datetime_array(arr)
assert not lib.is_datetime64_array(arr)
assert not lib.is_timedelta_array(arr)
assert not lib.is_timedelta64_array(arr)
assert not lib.is_timedelta_or_timedelta64_array(arr)

assert lib.is_datetime_with_singletz_array(
Expand All @@ -923,8 +913,6 @@ def test_is_datetimelike_array_all_nan_nat_like(self):
'is_datetime_array',
'is_datetime64_array',
'is_bool_array',
'is_timedelta_array',
'is_timedelta64_array',
'is_timedelta_or_timedelta64_array',
'is_date_array',
'is_time_array',
Expand Down
0