Skip to content

TST: fix failing #2752 tests for 32-bit builds #2837

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.

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

Closed
Closed
Changes from all commits
Commits
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
46 changes: 35 additions & 11 deletions pandas/tests/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -7109,11 +7109,17 @@ def test_get_X_columns(self):
['a', 'e']))

def test_get_numeric_data(self):
intname = np.dtype(np.int_).name
floatname = np.dtype(np.float_).name
datetime64name = np.dtype('M8[ns]').name
objectname = np.dtype(np.object_).name

df = DataFrame({'a': 1., 'b': 2, 'c': 'foo', 'f' : Timestamp('20010102')},
index=np.arange(10))
result = df.get_dtype_counts()
expected = Series({'int64': 1, 'float64' : 1, 'datetime64[ns]': 1, 'object' : 1})
expected = Series({intname: 1, floatname : 1, datetime64name: 1, objectname : 1})
result.sort()
expected.sort()
assert_series_equal(result, expected)

df = DataFrame({'a': 1., 'b': 2, 'c': 'foo',
Expand Down Expand Up @@ -8056,32 +8062,46 @@ def test_as_matrix_lcd(self):


def test_constructor_with_datetimes(self):
intname = np.dtype(np.int_).name
floatname = np.dtype(np.float_).name
datetime64name = np.dtype('M8[ns]').name
objectname = np.dtype(np.object_).name

# single item
df = DataFrame({'A' : 1, 'B' : 'foo', 'C' : 'bar', 'D' : Timestamp("20010101"), 'E' : datetime(2001,1,2,0,0) },
index=np.arange(10))
result = df.get_dtype_counts()
expected = Series({'int64': 1, 'datetime64[ns]': 2, 'object' : 2})
expected = Series({intname: 1, datetime64name: 2, objectname : 2})
result.sort()
expected.sort()
assert_series_equal(result, expected)

# check with ndarray construction ndim==0 (e.g. we are passing a ndim 0 ndarray with a dtype specified)
df = DataFrame({'a': 1., 'b': 2, 'c': 'foo', 'float64' : np.array(1.,dtype='float64'),
'int64' : np.array(1,dtype='int64')}, index=np.arange(10))
df = DataFrame({'a': 1., 'b': 2, 'c': 'foo', floatname : np.array(1.,dtype=floatname),
intname : np.array(1,dtype=intname)}, index=np.arange(10))
result = df.get_dtype_counts()
expected = Series({'int64': 2, 'float64' : 2, 'object' : 1})
expected = Series({intname: 2, floatname : 2, objectname : 1})
result.sort()
expected.sort()
assert_series_equal(result, expected)

# check with ndarray construction ndim>0
df = DataFrame({'a': 1., 'b': 2, 'c': 'foo', 'float64' : np.array([1.]*10,dtype='float64'),
'int64' : np.array([1]*10,dtype='int64')}, index=np.arange(10))
df = DataFrame({'a': 1., 'b': 2, 'c': 'foo', floatname : np.array([1.]*10,dtype=floatname),
intname : np.array([1]*10,dtype=intname)}, index=np.arange(10))
result = df.get_dtype_counts()
expected = Series({'int64': 2, 'float64' : 2, 'object' : 1})
expected = Series({intname: 2, floatname : 2, objectname : 1})
result.sort()
expected.sort()
assert_series_equal(result, expected)

# GH #2751 (construction with no index specified)
df = DataFrame({'a':[1,2,4,7], 'b':[1.2, 2.3, 5.1, 6.3], 'c':list('abcd'), 'd':[datetime(2000,1,1) for i in range(4)] })
result = df.get_dtype_counts()
expected = Series({'int64': 1, 'float64' : 1, 'datetime64[ns]': 1, 'object' : 1})
# TODO: fix this on 32-bit (or decide it's ok behavior?)
# expected = Series({intname: 1, floatname : 1, datetime64name: 1, objectname : 1})
expected = Series({'int64': 1, floatname : 1, datetime64name: 1, objectname : 1})
result.sort()
expected.sort()
assert_series_equal(result, expected)

# GH 2809
Expand All @@ -8092,7 +8112,9 @@ def test_constructor_with_datetimes(self):
self.assert_(datetime_s.dtype == 'M8[ns]')
df = DataFrame({'datetime_s':datetime_s})
result = df.get_dtype_counts()
expected = Series({ 'datetime64[ns]' : 1 })
expected = Series({ datetime64name : 1 })
result.sort()
expected.sort()
assert_series_equal(result, expected)

# GH 2810
Expand All @@ -8101,7 +8123,9 @@ def test_constructor_with_datetimes(self):
dates = [ts.date() for ts in ind]
df = DataFrame({'datetimes': datetimes, 'dates':dates})
result = df.get_dtype_counts()
expected = Series({ 'datetime64[ns]' : 1, 'object' : 1 })
expected = Series({ datetime64name : 1, objectname : 1 })
result.sort()
expected.sort()
assert_series_equal(result, expected)

def test_constructor_frame_copy(self):
Expand Down