From 262492f8320f1b37cf9a33496966ed6cef1b2fc1 Mon Sep 17 00:00:00 2001 From: mattrijk Date: Tue, 4 Oct 2016 19:53:11 -0400 Subject: [PATCH 1/3] TST: #14345 fixes TestDatetimeIndexOps test_nat AssertionErors --- pandas/tseries/tests/test_base.py | 91 ++++++++++++++++--------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/pandas/tseries/tests/test_base.py b/pandas/tseries/tests/test_base.py index 8a86fcba32ecb..bf363f8ab581f 100644 --- a/pandas/tseries/tests/test_base.py +++ b/pandas/tseries/tests/test_base.py @@ -861,21 +861,26 @@ def test_nat(self): self.assertIs(pd.DatetimeIndex([])._na_value, pd.NaT) for tz in [None, 'US/Eastern', 'UTC']: + idx = pd.DatetimeIndex(['2011-01-01', '2011-01-02'], tz=tz) self.assertTrue(idx._can_hold_na) tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) self.assertFalse(idx.hasnans) - tm.assert_numpy_array_equal(idx._nan_idxs, - np.array([], dtype=np.int64)) + + tm.assert_numpy_array_equal(idx._nan_idxs, np.array([], dtype=np.intp)) idx = pd.DatetimeIndex(['2011-01-01', 'NaT'], tz=tz) self.assertTrue(idx._can_hold_na) - tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) + self.assertTrue(idx.hasnans) - tm.assert_numpy_array_equal(idx._nan_idxs, - np.array([1], dtype=np.int64)) + + tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) + + + tm.assert_numpy_array_equal(idx._nan_idxs, np.array([1], dtype=np.intp)) + def test_equals(self): # GH 13107 @@ -1707,25 +1712,25 @@ def test_repeat(self): tm.assert_index_equal(res, exp) self.assertIsNone(res.freq) - def test_nat(self): - self.assertIs(pd.TimedeltaIndex._na_value, pd.NaT) - self.assertIs(pd.TimedeltaIndex([])._na_value, pd.NaT) - - idx = pd.TimedeltaIndex(['1 days', '2 days']) - self.assertTrue(idx._can_hold_na) - - tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) - self.assertFalse(idx.hasnans) - tm.assert_numpy_array_equal(idx._nan_idxs, - np.array([], dtype=np.int64)) - - idx = pd.TimedeltaIndex(['1 days', 'NaT']) - self.assertTrue(idx._can_hold_na) - - tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) - self.assertTrue(idx.hasnans) - tm.assert_numpy_array_equal(idx._nan_idxs, - np.array([1], dtype=np.int64)) + # def test_nat(self): + # self.assertIs(pd.TimedeltaIndex._na_value, pd.NaT) + # self.assertIs(pd.TimedeltaIndex([])._na_value, pd.NaT) + # + # idx = pd.TimedeltaIndex(['1 days', '2 days']) + # self.assertTrue(idx._can_hold_na) + # + # tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) + # self.assertFalse(idx.hasnans) + # tm.assert_numpy_array_equal(idx._nan_idxs, + # np.array([], dtype=np.int64)) + # + # idx = pd.TimedeltaIndex(['1 days', 'NaT']) + # self.assertTrue(idx._can_hold_na) + # + # tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) + # self.assertTrue(idx.hasnans) + # tm.assert_numpy_array_equal(idx._nan_idxs, + # np.array([1], dtype=np.int64)) def test_equals(self): # GH 13107 @@ -2704,25 +2709,25 @@ def test_repeat(self): for res in [index.repeat(3), np.repeat(index, 3)]: tm.assert_index_equal(res, exp) - def test_nat(self): - self.assertIs(pd.PeriodIndex._na_value, pd.NaT) - self.assertIs(pd.PeriodIndex([], freq='M')._na_value, pd.NaT) - - idx = pd.PeriodIndex(['2011-01-01', '2011-01-02'], freq='D') - self.assertTrue(idx._can_hold_na) - - tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) - self.assertFalse(idx.hasnans) - tm.assert_numpy_array_equal(idx._nan_idxs, - np.array([], dtype=np.int64)) - - idx = pd.PeriodIndex(['2011-01-01', 'NaT'], freq='D') - self.assertTrue(idx._can_hold_na) - - tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) - self.assertTrue(idx.hasnans) - tm.assert_numpy_array_equal(idx._nan_idxs, - np.array([1], dtype=np.int64)) + # def test_nat(self): + # self.assertIs(pd.PeriodIndex._na_value, pd.NaT) + # self.assertIs(pd.PeriodIndex([], freq='M')._na_value, pd.NaT) + # + # idx = pd.PeriodIndex(['2011-01-01', '2011-01-02'], freq='D') + # self.assertTrue(idx._can_hold_na) + # + # tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) + # self.assertFalse(idx.hasnans) + # tm.assert_numpy_array_equal(idx._nan_idxs, + # np.array([], dtype=np.int64)) + # + # idx = pd.PeriodIndex(['2011-01-01', 'NaT'], freq='D') + # self.assertTrue(idx._can_hold_na) + # + # tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) + # self.assertTrue(idx.hasnans) + # tm.assert_numpy_array_equal(idx._nan_idxs, + # np.array([1], dtype=np.int64)) def test_equals(self): # GH 13107 From ea4f1510f196808d767103fc9df80491fd3d6a31 Mon Sep 17 00:00:00 2001 From: mattrijk Date: Wed, 5 Oct 2016 13:56:01 -0400 Subject: [PATCH 2/3] second formatting update for whitespace --- pandas/tseries/tests/test_base.py | 91 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/pandas/tseries/tests/test_base.py b/pandas/tseries/tests/test_base.py index bf363f8ab581f..4da2d39fb1242 100644 --- a/pandas/tseries/tests/test_base.py +++ b/pandas/tseries/tests/test_base.py @@ -861,26 +861,21 @@ def test_nat(self): self.assertIs(pd.DatetimeIndex([])._na_value, pd.NaT) for tz in [None, 'US/Eastern', 'UTC']: - idx = pd.DatetimeIndex(['2011-01-01', '2011-01-02'], tz=tz) self.assertTrue(idx._can_hold_na) tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) self.assertFalse(idx.hasnans) - - tm.assert_numpy_array_equal(idx._nan_idxs, np.array([], dtype=np.intp)) + tm.assert_numpy_array_equal(idx._nan_idxs, + np.array([], dtype=np.intp)) idx = pd.DatetimeIndex(['2011-01-01', 'NaT'], tz=tz) self.assertTrue(idx._can_hold_na) - - self.assertTrue(idx.hasnans) - tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) - - - tm.assert_numpy_array_equal(idx._nan_idxs, np.array([1], dtype=np.intp)) - + self.assertTrue(idx.hasnans) + tm.assert_numpy_array_equal(idx._nan_idxs, + np.array([1], dtype=np.intp)) def test_equals(self): # GH 13107 @@ -1712,25 +1707,25 @@ def test_repeat(self): tm.assert_index_equal(res, exp) self.assertIsNone(res.freq) - # def test_nat(self): - # self.assertIs(pd.TimedeltaIndex._na_value, pd.NaT) - # self.assertIs(pd.TimedeltaIndex([])._na_value, pd.NaT) - # - # idx = pd.TimedeltaIndex(['1 days', '2 days']) - # self.assertTrue(idx._can_hold_na) - # - # tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) - # self.assertFalse(idx.hasnans) - # tm.assert_numpy_array_equal(idx._nan_idxs, - # np.array([], dtype=np.int64)) - # - # idx = pd.TimedeltaIndex(['1 days', 'NaT']) - # self.assertTrue(idx._can_hold_na) - # - # tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) - # self.assertTrue(idx.hasnans) - # tm.assert_numpy_array_equal(idx._nan_idxs, - # np.array([1], dtype=np.int64)) + def test_nat(self): + self.assertIs(pd.TimedeltaIndex._na_value, pd.NaT) + self.assertIs(pd.TimedeltaIndex([])._na_value, pd.NaT) + + idx = pd.TimedeltaIndex(['1 days', '2 days']) + self.assertTrue(idx._can_hold_na) + + tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) + self.assertFalse(idx.hasnans) + tm.assert_numpy_array_equal(idx._nan_idxs, + np.array([], dtype=np.intp)) + + idx = pd.TimedeltaIndex(['1 days', 'NaT']) + self.assertTrue(idx._can_hold_na) + + tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) + self.assertTrue(idx.hasnans) + tm.assert_numpy_array_equal(idx._nan_idxs, + np.array([1], dtype=np.intp)) def test_equals(self): # GH 13107 @@ -2709,25 +2704,25 @@ def test_repeat(self): for res in [index.repeat(3), np.repeat(index, 3)]: tm.assert_index_equal(res, exp) - # def test_nat(self): - # self.assertIs(pd.PeriodIndex._na_value, pd.NaT) - # self.assertIs(pd.PeriodIndex([], freq='M')._na_value, pd.NaT) - # - # idx = pd.PeriodIndex(['2011-01-01', '2011-01-02'], freq='D') - # self.assertTrue(idx._can_hold_na) - # - # tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) - # self.assertFalse(idx.hasnans) - # tm.assert_numpy_array_equal(idx._nan_idxs, - # np.array([], dtype=np.int64)) - # - # idx = pd.PeriodIndex(['2011-01-01', 'NaT'], freq='D') - # self.assertTrue(idx._can_hold_na) - # - # tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) - # self.assertTrue(idx.hasnans) - # tm.assert_numpy_array_equal(idx._nan_idxs, - # np.array([1], dtype=np.int64)) + def test_nat(self): + self.assertIs(pd.PeriodIndex._na_value, pd.NaT) + self.assertIs(pd.PeriodIndex([], freq='M')._na_value, pd.NaT) + + idx = pd.PeriodIndex(['2011-01-01', '2011-01-02'], freq='D') + self.assertTrue(idx._can_hold_na) + + tm.assert_numpy_array_equal(idx._isnan, np.array([False, False])) + self.assertFalse(idx.hasnans) + tm.assert_numpy_array_equal(idx._nan_idxs, + np.array([], dtype=np.intp)) + + idx = pd.PeriodIndex(['2011-01-01', 'NaT'], freq='D') + self.assertTrue(idx._can_hold_na) + + tm.assert_numpy_array_equal(idx._isnan, np.array([False, True])) + self.assertTrue(idx.hasnans) + tm.assert_numpy_array_equal(idx._nan_idxs, + np.array([1], dtype=np.intp)) def test_equals(self): # GH 13107 From 73ad3d75a47ba4d7e938eb0614a4fc71da0cdc2f Mon Sep 17 00:00:00 2001 From: mattrijk Date: Wed, 5 Oct 2016 14:27:09 -0400 Subject: [PATCH 3/3] line 2710 formatting update for whitespace --- pandas/tseries/tests/test_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tseries/tests/test_base.py b/pandas/tseries/tests/test_base.py index 4da2d39fb1242..a6d58fa3e7ef3 100644 --- a/pandas/tseries/tests/test_base.py +++ b/pandas/tseries/tests/test_base.py @@ -2707,7 +2707,7 @@ def test_repeat(self): def test_nat(self): self.assertIs(pd.PeriodIndex._na_value, pd.NaT) self.assertIs(pd.PeriodIndex([], freq='M')._na_value, pd.NaT) - + idx = pd.PeriodIndex(['2011-01-01', '2011-01-02'], freq='D') self.assertTrue(idx._can_hold_na)