Skip to content

Commit cfc1c80

Browse files
committed
Merge pull request #6156 from jreback/sparc_fix4
TST: rec arrays don't support datetimes in creation on certain platforms, related (GH6140)
2 parents 488037b + dcd3ec3 commit cfc1c80

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pandas/tests/test_frame.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -3967,7 +3967,14 @@ def test_from_records_with_datetimes(self):
39673967

39683968
arrdata = [np.array([datetime(2005, 3, 1, 0, 0), None])]
39693969
dtypes = [('EXPIRY', '<M8[ns]')]
3970-
recarray = np.core.records.fromarrays(arrdata, dtype=dtypes)
3970+
3971+
# this may fail on certain platforms because of a numpy issue
3972+
# related GH6140
3973+
try:
3974+
recarray = np.core.records.fromarrays(arrdata, dtype=dtypes)
3975+
except (ValueError):
3976+
raise nose.SkipTest('rec arrays with datetimes not supported')
3977+
39713978
result = DataFrame.from_records(recarray)
39723979
assert_frame_equal(result,expected)
39733980

pandas/tests/test_indexing.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -650,19 +650,19 @@ def test_loc_setitem_frame_multiples(self):
650650

651651
# multiple setting
652652
df = DataFrame({ 'A' : ['foo','bar','baz'],
653-
'B' : range(3) })
653+
'B' : Series(range(3),dtype=np.int64) })
654654
df.loc[0:1] = df.loc[1:2]
655655
expected = DataFrame({ 'A' : ['bar','baz','baz'],
656-
'B' : [1,2,2] })
656+
'B' : Series([1,2,2],dtype=np.int64) })
657657
assert_frame_equal(df, expected)
658658

659659

660660
# multiple setting with frame on rhs (with M8)
661661
df = DataFrame({ 'date' : date_range('2000-01-01','2000-01-5'),
662-
'val' : range(5) })
662+
'val' : Series(range(5),dtype=np.int64) })
663663
expected = DataFrame({ 'date' : [Timestamp('20000101'),Timestamp('20000102'),Timestamp('20000101'),
664664
Timestamp('20000102'),Timestamp('20000103')],
665-
'val' : [0,1,0,1,2] })
665+
'val' : Series([0,1,0,1,2],dtype=np.int64) })
666666

667667
df.loc[2:4] = df.loc[0:2]
668668
assert_frame_equal(df, expected)

0 commit comments

Comments
 (0)