8000 implement truediv, rtruediv directly in TimedeltaArray; tests by jbrockmendel · Pull Request #23829 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

implement truediv, rtruediv directly in TimedeltaArray; tests #23829

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 23 commits into from
Nov 29, 2018
Merged

implement truediv, rtruediv directly in TimedeltaArray; tests #23829

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6ec1f08
implement truediv, rtruediv directly in TimedeltaArray; tests
jbrockmendel Nov 21, 2018
4c2cc59
test tdi/tdi specifically
jbrockmendel Nov 21, 2018
bd2ee96
more checks and test cases
jbrockmendel Nov 21, 2018
3275dd9
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 21, 2018
79901f5
dont define _override_div_mod_methods, matches for pytest.raises
jbrockmendel Nov 21, 2018
adea273
change comment
jbrockmendel Nov 21, 2018
da9f743
whatsnew, GH references
jbrockmendel Nov 21, 2018
ba9e490
error msg py3 compat
jbrockmendel Nov 21, 2018
10bb49b
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 21, 2018
8f276ae
flake8 fixup, raise directly
jbrockmendel Nov 21, 2018
7d56da9
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 24, 2018
6097789
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 26, 2018
2037be8
sidestep object conversion
jbrockmendel Nov 26, 2018
ffedf35
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 27, 2018
2fc44aa
dont case result when operating against object dtype
jbrockmendel Nov 27, 2018
cd4ff57
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 28, 2018
641ad20
another GH reference
jbrockmendel Nov 28, 2018
e0d696f
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 28, 2018
7d9e677
comment
jbrockmendel Nov 28, 2018
dfc7af4
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 28, 2018
55cad6b
Fixup rebase mixup, un-skip part of a test that isnt broken after all
jbrockmendel Nov 29, 2018
d21ae78
Merge branch 'master' of https://github.com/pandas-dev/pandas into gt…
jbrockmendel Nov 29, 2018
d72bf90
flake8 fixup
jbrockmendel Nov 29, 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
Fixup rebase mixup, un-skip part of a test that isnt broken after all
  • Loading branch information
@jbrockmendel
jbrockmendel committed Nov 29, 2018
commit 55cad6b17d70dd12bb088266b1fe03fa401d18bf
3 changes: 1 addition & 2 deletions pandas/core/arrays/timedeltas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ def _simple_new(cls, values, freq=None, dtype=_TD_DTYPE):
def __new__(cls, values, freq=None, dtype=_TD_DTYPE, copy=False):

freq, freq_infer = dtl.maybe_infer_freq(freq)
values, inferred_freq = sequence_to_td64ns(values)

values, inferred_freq = sequence_to_td64ns(
values, copy=copy, unit=None)
Expand All @@ -178,7 +177,7 @@ def __new__(cls, values, freq=None, dtype=_TD_DTYPE, copy=False):
passed=freq.freqstr))
elif freq is None:
freq = inferred_freq
freq_infer = False
freq_infer = False

result = cls._simple_new(values, freq=freq)
# check that we are matching freqs
Expand Down
13 changes: 7 additions & 6 deletions pandas/tests/arithmetic/test_timedelta64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,10 +455,10 @@ def test_td64arr_add_sub_timestamp(self, box_with_array):
ts = Timestamp('2012-01-01')
# TODO: parametrize over types of datetime scalar?

tdarr = timedelta_range('1 day', periods=3)
tdi = timedelta_range('1 day', periods=3)
expected = pd.date_range('2012-01-02', periods=3)

tdarr = tm.box_expected(tdarr, box_with_array)
tdarr = tm.box_expected(tdi, box_with_array)
expected = tm.box_expected(expected, box_with_array)

tm.assert_equal(ts + tdarr, expected)
Expand Down Expand Up @@ -1450,12 +1450,13 @@ def test_td64arr_div_numeric_array(self, box_with_array, vector, dtype):
with pytest.raises(TypeError, match=pattern):
vector / tdser

if (not isinstance(vector, pd.Index) and
box_with_array is not pd.DataFrame):
if not isinstance(vector, pd.Index):
# Index.__rdiv__ won't try to operate elementwise, just raises
# DataFrame casts just-NaT object column to datetime64
result = tdser / vector.astype(object)
expected = [tdser[n] / vector[n] for n in range(len(tdser))]
if box_with_array is pd.DataFrame:
expected = [tdser.iloc[0, n] / vector[n] for n in range(len(vector))]
else:
expected = [tdser[n] / vector[n] for n in range(len(tdser))]
expected = tm.box_expected(expected, xbox)
Copy link
Member
@jorisvandenbossche jorisvandenbossche Nov 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this converted the expected list to an DatetimeArray, while the expected result is on object ndarray? (so it's not really testing that?)

Copy link
Member Author
@jbrockmendel jbrockmendel Nov 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. In the case where xbox is tm.to_array (the only case that could conceivably give a DatetimeArray), tm.to_array(any_list) returning np.array(that_list)

Copy link
Member
@jorisvandenbossche jorisvandenbossche Nov 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, OK, all a bit opaque .. (I checked what get_upcast_box and box_expected do, but not box_with_array :-))

Copy link
Member Author
@jbrockmendel jbrockmendel Nov 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yah, I'm hoping to simplify some of it, and ideally even get rid of box_expected, but it'll be a while before thats feasible.

tm.assert_equal(result, expected)

Expand Down
0