Skip to content

TST: close sparc test failures #5780

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 2 commits into from
Dec 27, 2013
Merged

TST: close sparc test failures #5780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e18da0e
TST: closes (GH5778), failing tests on non-little endian for stata (s…
jreback Dec 27, 2013
9ed4f7d
BUG: big endian timedelta fix (GH5779)
jreback Dec 27, 2013
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
21 changes: 15 additions & 6 deletions pandas/core/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,17 @@ class AmbiguousIndexError(PandasError, KeyError):


_POSSIBLY_CAST_DTYPES = set([np.dtype(t)
for t in ['M8[ns]', 'm8[ns]', 'O', 'int8',
for t in ['M8[ns]', '>M8[ns]', '<M8[ns]',
'm8[ns]', '>m8[ns]', '<m8[ns]',
'O', 'int8',
'uint8', 'int16', 'uint16', 'int32',
'uint32', 'int64', 'uint64']])

_NS_DTYPE = np.dtype('M8[ns]')
_TD_DTYPE = np.dtype('m8[ns]')
_INT64_DTYPE = np.dtype(np.int64)
_DATELIKE_DTYPES = set([np.dtype(t) for t in ['M8[ns]', 'm8[ns]']])
_DATELIKE_DTYPES = set([np.dtype(t) for t in ['M8[ns]', '<M8[ns]', '>M8[ns]',
'm8[ns]', '<m8[ns]', '>m8[ns]']])


# define abstract base classes to enable isinstance type checking on our
Expand Down Expand Up @@ -1572,11 +1575,17 @@ def _possibly_cast_to_datetime(value, dtype, coerce=False):

# force the dtype if needed
if is_datetime64 and dtype != _NS_DTYPE:
raise TypeError(
"cannot convert datetimelike to dtype [%s]" % dtype)
if dtype.name == 'datetime64[ns]':
dtype = _NS_DTYPE
else:
raise TypeError(
"cannot convert datetimelike to dtype [%s]" % dtype)
elif is_timedelta64 and dtype != _TD_DTYPE:
raise TypeError(
"cannot convert timedeltalike to dtype [%s]" % dtype)
if dtype.name == 'timedelta64[ns]':
dtype = _TD_DTYPE
else:
raise TypeError(
"cannot convert timedeltalike to dtype [%s]" % dtype)

if np.isscalar(value):
if value == tslib.iNaT or isnull(value):
Expand Down
2 changes: 2 additions & 0 deletions pandas/core/internals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,8 +1245,10 @@ def _try_operate(self, values):
def _try_coerce_result(self, result):
""" reverse of try_coerce_args / try_operate """
if isinstance(result, np.ndarray):
mask = isnull(result)
if result.dtype.kind in ['i', 'f', 'O']:
result = result.astype('m8[ns]')
result[mask] = tslib.iNaT
elif isinstance(result, np.integer):
result = np.timedelta64(result)
return result
Expand Down
20 changes: 11 additions & 9 deletions pandas/io/tests/test_stata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
from pandas.util.misc import is_little_endian
from pandas import compat

def skip_if_not_little_endian():
if not is_little_endian():
raise nose.SkipTest("known failure of test on non-little endian")

class TestStata(tm.TestCase):

def setUp(self):
Expand Down Expand Up @@ -145,9 +149,7 @@ def test_read_dta4(self):
tm.assert_frame_equal(parsed_13, expected)

def test_read_write_dta5(self):
if not is_little_endian():
raise nose.SkipTest("known failure of test_write_dta5 on "
"non-little endian")
skip_if_not_little_endian()

original = DataFrame([(np.nan, np.nan, np.nan, np.nan, np.nan)],
columns=['float_miss', 'double_miss', 'byte_miss',
Expand All @@ -161,9 +163,7 @@ def test_read_write_dta5(self):
original)

def test_write_dta6(self):
if not is_little_endian():
raise nose.SkipTest("known failure of test_write_dta6 on "
"non-little endian")
skip_if_not_little_endian()

original = self.read_csv(self.csv3)
original.index.name = 'index'
Expand Down Expand Up @@ -193,9 +193,7 @@ def test_read_dta9(self):
tm.assert_frame_equal(parsed, expected)

def test_read_write_dta10(self):
if not is_little_endian():
raise nose.SkipTest("known failure of test_write_dta10 on "
"non-little endian")
skip_if_not_little_endian()

original = DataFrame(data=[["string", "object", 1, 1.1,
np.datetime64('2003-12-25')]],
Expand Down Expand Up @@ -232,6 +230,8 @@ def test_encoding(self):
self.assert_(isinstance(result, unicode))

def test_read_write_dta11(self):
skip_if_not_little_endian()

original = DataFrame([(1, 2, 3, 4)],
columns=['good', compat.u('b\u00E4d'), '8number', 'astringwithmorethan32characters______'])
formatted = DataFrame([(1, 2, 3, 4)],
Expand All @@ -248,6 +248,8 @@ def test_read_write_dta11(self):
tm.assert_frame_equal(written_and_read_again.set_index('index'), formatted)

def test_read_write_dta12(self):
skip_if_not_little_endian()

original = DataFrame([(1, 2, 3, 4)],
columns=['astringwithmorethan32characters_1', 'astringwithmorethan32characters_2', '+', '-'])
formatted = DataFrame([(1, 2, 3, 4)],
Expand Down