From 4644972238a99db49fb88f1e374f93a957c686e7 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Tue, 9 Jan 2018 22:23:08 -0800 Subject: [PATCH 1/6] break up repetitive test; make more thorough and explicit --- pandas/tests/series/test_operators.py | 161 +++++++++++++++++--------- 1 file changed, 107 insertions(+), 54 deletions(-) diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index dbfeb9715c59e..de4804439a8cf 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -667,83 +667,136 @@ def test_div(self): assert_series_equal(result, expected) -class TestTimedeltaSeriesArithmetic(object): - def test_timedelta_series_ops(self): - # GH11925 - s = Series(timedelta_range('1 day', periods=3)) - ts = Timestamp('2012-01-01') - expected = Series(date_range('2012-01-02', periods=3)) - assert_series_equal(ts + s, expected) - assert_series_equal(s + ts, expected) +class TestTimedeltaSeriesArithmeticWithIntegers(object): + @classmethod + def setup_class(cls): + cls.tdser = Series(['59 Days', '59 Days', 'NaT'], + dtype='timedelta64[ns]') + cls.intser = Series([2, 3, 4]) - expected2 = Series(date_range('2011-12-31', periods=3, freq='-1D')) - assert_series_equal(ts - s, expected2) - assert_series_equal(ts + (-s), expected2) + # ------------------------------------------------------------------ + # Addition and Subtraction + + def test_td64series_add_int_series_invalid(self): + with pytest.raises(TypeError): + self.tdser + self.intser + + @pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds') + def test_td64series_radd_int_series_invalid(self): + with pytest.raises(TypeError): + self.intser + self.tdser + + def test_td64series_sub_int_series_invalid(self): + with pytest.raises(TypeError): + self.tdser - self.intser + + @pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds') + def test_td64series_rsub_int_series_invalid(self): + with pytest.raises(TypeError): + self.intser - self.tdser + + @pytest.mark.parametrize('scalar', [1, 1.5, np.array(2)]) + def test_td64series_add_sub_numeric_scalar_invalid(self, scalar): + with pytest.raises(TypeError): + self.tdser + scalar + with pytest.raises(TypeError): + scalar + self.tdser + with pytest.raises(TypeError): + self.tdser - scalar + with pytest.raises(TypeError): + scalar - self.tdser + + @pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16', + 'uint64', 'uint32', 'uint16', 'uint8', + 'float64', 'float32', 'float16']) + @pytest.mark.parametrize('vector', [ + np.array([1, 2, 3]), + pd.Index([1, 2, 3]), + pytest.param(Series([1, 2, 3]), + marks=pytest.mark.xfail(reason='GH#19123 integer ' + 'interpreted as nanos')) + ]) + def test_td64series_add_sub_numeric_array_invalid(self, vector, dtype): + vector = vector.astype(dtype) + with pytest.raises(TypeError): + self.tdser + vector + with pytest.raises(TypeError): + vector + self.tdser + with pytest.raises(TypeError): + self.tdser - vector + with pytest.raises(TypeError): + vector - self.tdser + + # ------------------------------------------------------------------ + # Multiplicaton and Division def test_timedelta64_operations_with_integers(self): # GH 4521 # divide/multiply by integers - startdate = Series(date_range('2013-01-01', '2013-01-03')) - enddate = Series(date_range('2013-03-01', '2013-03-03')) - - s1 = enddate - startdate - s1[2] = np.nan - s2 = Series([2, 3, 4]) - expected = Series(s1.values.astype(np.int64) / s2, dtype='m8[ns]') - expected[2] = np.nan + s1 = self.tdser + s2 = self.intser + expected = Series(['29.5D', '19D 16H', 'NaT'], dtype='timedelta64[ns]') result = s1 / s2 assert_series_equal(result, expected) - s2 = Series([20, 30, 40]) - expected = Series(s1.values.astype(np.int64) / s2, dtype='m8[ns]') - expected[2] = np.nan - result = s1 / s2 + expected = Series(['2.95D', '1D 23H 12m', 'NaT'], + dtype='timedelta64[ns]') + result = s1 / Series([20, 30, 40]) + assert_series_equal(result, expected) + result = s1 / Series([20, 30, 40]).astype(float) assert_series_equal(result, expected) + expected = Series(['29.5D', '29.5D', 'NaT'], dtype='timedelta64[ns]') result = s1 / 2 - expected = Series(s1.values.astype(np.int64) / 2, dtype='m8[ns]') - expected[2] = np.nan + assert_series_equal(result, expected) + result = s1 / 2.0 assert_series_equal(result, expected) - s2 = Series([20, 30, 40]) - expected = Series(s1.values.astype(np.int64) * s2, dtype='m8[ns]') - expected[2] = np.nan - result = s1 * s2 + expected = Series(['1180 Days', '1770 Days', 'NaT'], + dtype='timedelta64[ns]') + result = s1 * Series([20, 30, 40]) assert_series_equal(result, expected) for dtype in ['int32', 'int16', 'uint32', 'uint64', 'uint32', 'uint16', 'uint8']: - s2 = Series([20, 30, 40], dtype=dtype) - expected = Series( - s1.values.astype(np.int64) * s2.astype(np.int64), - dtype='m8[ns]') - expected[2] = np.nan - result = s1 * s2 + result = s1 * Series([20, 30, 40], dtype=dtype) assert_series_equal(result, expected) - result = s1 * 2 - expected = Series(s1.values.astype(np.int64) * 2, dtype='m8[ns]') - expected[2] = np.nan + @pytest.mark.parametrize('one', [1, np.array(1), + 1.0, np.array(1.0)]) + def test_td64series_mul_numeric_scalar(self, one): + # GH 4521 + # divide/multiply by integers + tdser = self.tdser + expected = Series(['-59 Days', '-59 Days', 'NaT'], + dtype='timedelta64[ns]') + + result = tdser * (-one) assert_series_equal(result, expected) + result = (-one) * tdser + assert_series_equal(result, expected) + + expected = Series(['118 Days', '118 Days', 'NaT'], + dtype='timedelta64[ns]') - result = s1 * -1 - expected = Series(s1.values.astype(np.int64) * -1, dtype='m8[ns]') - expected[2] = np.nan + result = tdser * (2 * one) + assert_series_equal(result, expected) + result = (2 * one) * tdser assert_series_equal(result, expected) - # invalid ops - assert_series_equal(s1 / s2.astype(float), - Series([Timedelta('2 days 22:48:00'), Timedelta( - '1 days 23:12:00'), Timedelta('NaT')])) - assert_series_equal(s1 / 2.0, - Series([Timedelta('29 days 12:00:00'), Timedelta( - '29 days 12:00:00'), Timedelta('NaT')])) - - for op in ['__add__', '__sub__']: - sop = getattr(s1, op, None) - if sop is not None: - pytest.raises(TypeError, sop, 1) - pytest.raises(TypeError, sop, s2.values) + +class TestTimedeltaSeriesArithmetic(object): + def test_timedelta_series_ops(self): + # GH11925 + s = Series(timedelta_range('1 day', periods=3)) + ts = Timestamp('2012-01-01') + expected = Series(date_range('2012-01-02', periods=3)) + assert_series_equal(ts + s, expected) + assert_series_equal(s + ts, expected) + + expected2 = Series(date_range('2011-12-31', periods=3, freq='-1D')) + assert_series_equal(ts - s, expected2) + assert_series_equal(ts + (-s), expected2) def test_timedelta64_operations_with_DateOffset(self): # GH 10699 From 77b3ad7bbb4fa4641b958cabc356cd7764c50a59 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Tue, 9 Jan 2018 22:38:49 -0800 Subject: [PATCH 2/6] further break up big test, parametrize, test missing cases, identify several xfailing --- pandas/tests/series/test_operators.py | 68 +++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index de4804439a8cf..9a1f031e368d5 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -746,12 +746,6 @@ def test_timedelta64_operations_with_integers(self): result = s1 / Series([20, 30, 40]).astype(float) assert_series_equal(result, expected) - expected = Series(['29.5D', '29.5D', 'NaT'], dtype='timedelta64[ns]') - result = s1 / 2 - assert_series_equal(result, expected) - result = s1 / 2.0 - assert_series_equal(result, expected) - expected = Series(['1180 Days', '1770 Days', 'NaT'], dtype='timedelta64[ns]') result = s1 * Series([20, 30, 40]) @@ -762,8 +756,48 @@ def test_timedelta64_operations_with_integers(self): result = s1 * Series([20, 30, 40], dtype=dtype) assert_series_equal(result, expected) - @pytest.mark.parametrize('one', [1, np.array(1), - 1.0, np.array(1.0)]) + @pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16', + 'uint64', 'uint32', 'uint16', 'uint8', + 'float64', 'float32', 'float16']) + @pytest.mark.parametrize('vector', [np.array([20, 30, 40]), + pd.Index([20, 30, 40]), + Series([20, 30, 40])]) + def test_td64series_mul_numeric_array(self, vector, dtype): + # GH 4521 + # divide/multiply by integers + tdser = self.tdser + vector = vector.astype(dtype) + + expected = Series(['1180 Days', '1770 Days', 'NaT'], + dtype='timedelta64[ns]') + + result = tdser * vector + assert_series_equal(result, expected) + + @pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16', + 'uint64', 'uint32', 'uint16', 'uint8', + 'float64', 'float32', 'float16']) + @pytest.mark.parametrize('vector', [ + np.array([20, 30, 40]), + pytest.param(pd.Index([20, 30, 40]), + marks=pytest.mark.xfail(reason='__mul__ raises ' + 'instead of returning ' + 'NotImplemented')), + Series([20, 30, 40]) + ]) + def test_td64series_rmul_numeric_array(self, vector, dtype): + # GH 4521 + # divide/multiply by integers + tdser = self.tdser + vector = vector.astype(dtype) + + expected = Series(['1180 Days', '1770 Days', 'NaT'], + dtype='timedelta64[ns]') + + result = vector * tdser + assert_series_equal(result, expected) + + @pytest.mark.parametrize('one', [1, np.array(1), 1.0, np.array(1.0)]) def test_td64series_mul_numeric_scalar(self, one): # GH 4521 # divide/multiply by integers @@ -784,6 +818,24 @@ def test_td64series_mul_numeric_scalar(self, one): result = (2 * one) * tdser assert_series_equal(result, expected) + @pytest.mark.parametrize('two', [ + 2, 2.0, + pytest.param(np.array(2), + marks=pytest.mark.xfail(reason='GH#19011 is_list_like ' + 'incorrectly True.')), + pytest.param(np.array(2.0), + marks=pytest.mark.xfail(reason='GH#19011 is_list_like ' + 'incorrectly True.')), + ]) + def test_td64series_div_numeric_scalar(self, two): + # GH 4521 + # divide/multiply by integers + tdser = self.tdser + expected = Series(['29.5D', '29.5D', 'NaT'], dtype='timedelta64[ns]') + + result = tdser / two + assert_series_equal(result, expected) + class TestTimedeltaSeriesArithmetic(object): def test_timedelta_series_ops(self): From 5e6281e46ff667f42ca3530e1039ef57bf963b30 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Tue, 9 Jan 2018 22:43:09 -0800 Subject: [PATCH 3/6] parametrize the last bits of test_timedelta64_operations_with_integers --- pandas/tests/series/test_operators.py | 30 +++++++++++---------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index 9a1f031e368d5..7ace467996ac8 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -730,31 +730,25 @@ def test_td64series_add_sub_numeric_array_invalid(self, vector, dtype): # ------------------------------------------------------------------ # Multiplicaton and Division - def test_timedelta64_operations_with_integers(self): + @pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16', + 'uint64', 'uint32', 'uint16', 'uint8', + 'float64', 'float32', 'float16']) + @pytest.mark.parametrize('vector', [np.array([20, 30, 40]), + pd.Index([20, 30, 40]), + Series([20, 30, 40])]) + def test_td64series_div_numeric_array(self, vector, dtype): # GH 4521 # divide/multiply by integers - s1 = self.tdser - s2 = self.intser - expected = Series(['29.5D', '19D 16H', 'NaT'], dtype='timedelta64[ns]') - result = s1 / s2 - assert_series_equal(result, expected) - + tdser = self.tdser + vector = vector.astype(dtype) expected = Series(['2.95D', '1D 23H 12m', 'NaT'], dtype='timedelta64[ns]') - result = s1 / Series([20, 30, 40]) - assert_series_equal(result, expected) - result = s1 / Series([20, 30, 40]).astype(float) - assert_series_equal(result, expected) - expected = Series(['1180 Days', '1770 Days', 'NaT'], - dtype='timedelta64[ns]') - result = s1 * Series([20, 30, 40]) + result = tdser / vector assert_series_equal(result, expected) - for dtype in ['int32', 'int16', 'uint32', 'uint64', 'uint32', 'uint16', - 'uint8']: - result = s1 * Series([20, 30, 40], dtype=dtype) - assert_series_equal(result, expected) + with pytest.raises(TypeError): + vector / tdser @pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16', 'uint64', 'uint32', 'uint16', 'uint8', From 2750c207c0aec1427000d96a1c01693e30c73083 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Wed, 10 Jan 2018 10:22:56 -0800 Subject: [PATCH 4/6] remove setup_class --- pandas/tests/series/test_operators.py | 47 ++++++++++++++------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index c856f37a9f331..c2f0758a2cf5f 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -668,43 +668,45 @@ def test_div(self): class TestTimedeltaSeriesArithmeticWithIntegers(object): - @classmethod - def setup_class(cls): - cls.tdser = Series(['59 Days', '59 Days', 'NaT'], - dtype='timedelta64[ns]') - cls.intser = Series([2, 3, 4]) + # Tests for Series with dtype 'timedelta64[ns]' arithmetic operations + # with integer and int-like others # ------------------------------------------------------------------ # Addition and Subtraction def test_td64series_add_int_series_invalid(self): + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') with pytest.raises(TypeError): - self.tdser + self.intser + tdser + Series([2, 3, 4]) @pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds') def test_td64series_radd_int_series_invalid(self): + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') with pytest.raises(TypeError): - self.intser + self.tdser + Series([2, 3, 4]) + tdser def test_td64series_sub_int_series_invalid(self): + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') with pytest.raises(TypeError): - self.tdser - self.intser + tdser - Series([2, 3, 4]) @pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds') def test_td64series_rsub_int_series_invalid(self): + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') with pytest.raises(TypeError): - self.intser - self.tdser + Series([2, 3, 4]) - tdser @pytest.mark.parametrize('scalar', [1, 1.5, np.array(2)]) def test_td64series_add_sub_numeric_scalar_invalid(self, scalar): + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') with pytest.raises(TypeError): - self.tdser + scalar + tdser + scalar with pytest.raises(TypeError): - scalar + self.tdser + scalar + tdser with pytest.raises(TypeError): - self.tdser - scalar + tdser - scalar with pytest.raises(TypeError): - scalar - self.tdser + scalar - tdser @pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16', 'uint64', 'uint32', 'uint16', 'uint8', @@ -717,15 +719,16 @@ def test_td64series_add_sub_numeric_scalar_invalid(self, scalar): 'interpreted as nanos')) ]) def test_td64series_add_sub_numeric_array_invalid(self, vector, dtype): + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') vector = vector.astype(dtype) with pytest.raises(TypeError): - self.tdser + vector + tdser + vector with pytest.raises(TypeError): - vector + self.tdser + vector + tdser with pytest.raises(TypeError): - self.tdser - vector + tdser - vector with pytest.raises(TypeError): - vector - self.tdser + vector - tdser # ------------------------------------------------------------------ # Multiplicaton and Division @@ -739,7 +742,7 @@ def test_td64series_add_sub_numeric_array_invalid(self, vector, dtype): def test_td64series_div_numeric_array(self, vector, dtype): # GH 4521 # divide/multiply by integers - tdser = self.tdser + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') vector = vector.astype(dtype) expected = Series(['2.95D', '1D 23H 12m', 'NaT'], dtype='timedelta64[ns]') @@ -759,7 +762,7 @@ def test_td64series_div_numeric_array(self, vector, dtype): def test_td64series_mul_numeric_array(self, vector, dtype): # GH 4521 # divide/multiply by integers - tdser = self.tdser + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') vector = vector.astype(dtype) expected = Series(['1180 Days', '1770 Days', 'NaT'], @@ -782,7 +785,7 @@ def test_td64series_mul_numeric_array(self, vector, dtype): def test_td64series_rmul_numeric_array(self, vector, dtype): # GH 4521 # divide/multiply by integers - tdser = self.tdser + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') vector = vector.astype(dtype) expected = Series(['1180 Days', '1770 Days', 'NaT'], @@ -795,7 +798,7 @@ def test_td64series_rmul_numeric_array(self, vector, dtype): def test_td64series_mul_numeric_scalar(self, one): # GH 4521 # divide/multiply by integers - tdser = self.tdser + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') expected = Series(['-59 Days', '-59 Days', 'NaT'], dtype='timedelta64[ns]') @@ -824,7 +827,7 @@ def test_td64series_mul_numeric_scalar(self, one): def test_td64series_div_numeric_scalar(self, two): # GH 4521 # divide/multiply by integers - tdser = self.tdser + tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') expected = Series(['29.5D', '29.5D', 'NaT'], dtype='timedelta64[ns]') result = tdser / two From 69703e16e067d8b9a869c41092c3282b09fcb837 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Wed, 10 Jan 2018 10:28:18 -0800 Subject: [PATCH 5/6] rename test_timedelta_series_ops more informative name --- pandas/tests/series/test_operators.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index c2f0758a2cf5f..26fa809b361ac 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -835,17 +835,20 @@ def test_td64series_div_numeric_scalar(self, two): class TestTimedeltaSeriesArithmetic(object): - def test_timedelta_series_ops(self): + def test_td64series_add_sub_timestamp(self): # GH11925 - s = Series(timedelta_range('1 day', periods=3)) + tdser = Series(timedelta_range('1 day', periods=3)) ts = Timestamp('2012-01-01') expected = Series(date_range('2012-01-02', periods=3)) - assert_series_equal(ts + s, expected) - assert_series_equal(s + ts, expected) + assert_series_equal(ts + tdser, expected) + assert_series_equal(tdser + ts, expected) expected2 = Series(date_range('2011-12-31', periods=3, freq='-1D')) - assert_series_equal(ts - s, expected2) - assert_series_equal(ts + (-s), expected2) + assert_series_equal(ts - tdser, expected2) + assert_series_equal(ts + (-tdser), expected2) + + with pytest.raises(TypeError): + tdser - ts def test_timedelta64_operations_with_DateOffset(self): # GH 10699 From 5560f075da40a119f13860092e586f85f7176750 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Thu, 11 Jan 2018 17:25:13 -0800 Subject: [PATCH 6/6] use fixture as requested --- pandas/tests/series/test_operators.py | 39 ++++++++++++--------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index 26fa809b361ac..783fcddac1280 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -28,6 +28,11 @@ from .common import TestData +@pytest.fixture +def tdser(): + return Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') + + class TestSeriesComparisons(object): def test_series_comparison_scalars(self): series = Series(date_range('1/1/2000', periods=10)) @@ -674,31 +679,26 @@ class TestTimedeltaSeriesArithmeticWithIntegers(object): # ------------------------------------------------------------------ # Addition and Subtraction - def test_td64series_add_int_series_invalid(self): - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') + def test_td64series_add_int_series_invalid(self, tdser): with pytest.raises(TypeError): tdser + Series([2, 3, 4]) @pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds') - def test_td64series_radd_int_series_invalid(self): - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') + def test_td64series_radd_int_series_invalid(self, tdser): with pytest.raises(TypeError): Series([2, 3, 4]) + tdser - def test_td64series_sub_int_series_invalid(self): - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') + def test_td64series_sub_int_series_invalid(self, tdser): with pytest.raises(TypeError): tdser - Series([2, 3, 4]) @pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds') - def test_td64series_rsub_int_series_invalid(self): - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') + def test_td64series_rsub_int_series_invalid(self, tdser): with pytest.raises(TypeError): Series([2, 3, 4]) - tdser @pytest.mark.parametrize('scalar', [1, 1.5, np.array(2)]) - def test_td64series_add_sub_numeric_scalar_invalid(self, scalar): - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') + def test_td64series_add_sub_numeric_scalar_invalid(self, scalar, tdser): with pytest.raises(TypeError): tdser + scalar with pytest.raises(TypeError): @@ -718,8 +718,8 @@ def test_td64series_add_sub_numeric_scalar_invalid(self, scalar): marks=pytest.mark.xfail(reason='GH#19123 integer ' 'interpreted as nanos')) ]) - def test_td64series_add_sub_numeric_array_invalid(self, vector, dtype): - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') + def test_td64series_add_sub_numeric_array_invalid(self, vector, + dtype, tdser): vector = vector.astype(dtype) with pytest.raises(TypeError): tdser + vector @@ -739,10 +739,9 @@ def test_td64series_add_sub_numeric_array_invalid(self, vector, dtype): @pytest.mark.parametrize('vector', [np.array([20, 30, 40]), pd.Index([20, 30, 40]), Series([20, 30, 40])]) - def test_td64series_div_numeric_array(self, vector, dtype): + def test_td64series_div_numeric_array(self, vector, dtype, tdser): # GH 4521 # divide/multiply by integers - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') vector = vector.astype(dtype) expected = Series(['2.95D', '1D 23H 12m', 'NaT'], dtype='timedelta64[ns]') @@ -759,10 +758,9 @@ def test_td64series_div_numeric_array(self, vector, dtype): @pytest.mark.parametrize('vector', [np.array([20, 30, 40]), pd.Index([20, 30, 40]), Series([20, 30, 40])]) - def test_td64series_mul_numeric_array(self, vector, dtype): + def test_td64series_mul_numeric_array(self, vector, dtype, tdser): # GH 4521 # divide/multiply by integers - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') vector = vector.astype(dtype) expected = Series(['1180 Days', '1770 Days', 'NaT'], @@ -782,10 +780,9 @@ def test_td64series_mul_numeric_array(self, vector, dtype): 'NotImplemented')), Series([20, 30, 40]) ]) - def test_td64series_rmul_numeric_array(self, vector, dtype): + def test_td64series_rmul_numeric_array(self, vector, dtype, tdser): # GH 4521 # divide/multiply by integers - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') vector = vector.astype(dtype) expected = Series(['1180 Days', '1770 Days', 'NaT'], @@ -795,10 +792,9 @@ def test_td64series_rmul_numeric_array(self, vector, dtype): assert_series_equal(result, expected) @pytest.mark.parametrize('one', [1, np.array(1), 1.0, np.array(1.0)]) - def test_td64series_mul_numeric_scalar(self, one): + def test_td64series_mul_numeric_scalar(self, one, tdser): # GH 4521 # divide/multiply by integers - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') expected = Series(['-59 Days', '-59 Days', 'NaT'], dtype='timedelta64[ns]') @@ -824,10 +820,9 @@ def test_td64series_mul_numeric_scalar(self, one): marks=pytest.mark.xfail(reason='GH#19011 is_list_like ' 'incorrectly True.')), ]) - def test_td64series_div_numeric_scalar(self, two): + def test_td64series_div_numeric_scalar(self, two, tdser): # GH 4521 # divide/multiply by integers - tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]') expected = Series(['29.5D', '29.5D', 'NaT'], dtype='timedelta64[ns]') result = tdser / two