Skip to content

Commit 5d16b52

Browse files
committed
Fixturize and clean imports for test_arithmetic
1 parent bf4d4b7 commit 5d16b52

File tree

2 files changed

+136
-170
lines changed

2 files changed

+136
-170
lines changed

Diff for: pandas/tests/frame/conftest.py

+10-8
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,10 @@ def mixed_float_frame():
8282
Columns are ['A', 'B', 'C', 'D'].
8383
"""
8484
df = DataFrame(tm.getSeriesData())
85-
df.A = df.A.astype('float16')
85+
df.A = df.A.astype('float32')
8686
df.B = df.B.astype('float32')
87-
df.C = df.C.astype('float64')
87+
df.C = df.C.astype('float16')
88+
df.D = df.D.astype('float64')
8889
return df
8990

9091

@@ -96,9 +97,10 @@ def mixed_float_frame2():
9697
Columns are ['A', 'B', 'C', 'D'].
9798
"""
9899
df = DataFrame(tm.getSeriesData())
99-
df.D = df.D.astype('float16')
100+
df.D = df.D.astype('float32')
100101
df.C = df.C.astype('float32')
101-
df.B = df.B.astype('float64')
102+
df.B = df.B.astype('float16')
103+
df.D = df.D.astype('float64')
102104
return df
103105

104106

@@ -111,10 +113,10 @@ def mixed_int_frame():
111113
"""
112114
df = DataFrame({k: v.astype(int)
113115
for k, v in compat.iteritems(tm.getSeriesData())})
114-
df.A = df.A.astype('uint8')
115-
df.B = df.B.astype('int32')
116-
df.C = df.C.astype('int64')
117-
df.D = np.ones(len(df.D), dtype='uint64')
116+
df.A = df.A.astype('int32')
117+
df.B = np.ones(len(df.B), dtype='uint64')
118+
df.C = df.C.astype('uint8')
119+
df.D = df.C.astype('int64')
118120
return df
119121

120122

0 commit comments

Comments
 (0)