Skip to content

Commit d677f94

Browse files
author
tp
committed
Let initialisation from dicts use insertion order for py>=36, part I
1 parent aa59954 commit d677f94

9 files changed

+33
-33
lines changed

‎pandas/tests/frame/test_apply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ def test_infer_output_shape_columns(self):
646646
'datetime': [pd.Timestamp('2017-11-29 03:30:00'),
647647
pd.Timestamp('2017-11-29 03:45:00')]})
648648
result = df.apply(lambda row: (row.number, row.string), axis=1)
649-
expected = Series([t[2:] for t in df.itertuples()])
649+
expected = Series([(t.number, t.string) for t in df.itertuples()])
650650
assert_series_equal(result, expected)
651651

652652
def test_infer_output_shape_listlike_columns(self):

‎pandas/tests/frame/test_block_internals.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ def test_get_numeric_data(self):
405405
result = df.get_dtype_counts()
406406
expected = Series({'int64': 1, 'float64': 1,
407407
datetime64name: 1, objectname: 1})
408-
result.sort_index()
409-
expected.sort_index()
408+
result = result.sort_index()
409+
expected = expected.sort_index()
410410
assert_series_equal(result, expected)
411411

412412
df = DataFrame({'a': 1., 'b': 2, 'c': 'foo',

‎pandas/tests/frame/test_constructors.py

+10-11
Original file line numberDiff line numberDiff line change
@@ -1362,9 +1362,8 @@ def test_constructor_with_datetimes(self):
13621362
expected['float64'] = 1
13631363
expected[floatname] = 1
13641364

1365-
result.sort_index()
1366-
expected = Series(expected)
1367-
expected.sort_index()
1365+
result = result.sort_index()
1366+
expected = Series(expected).sort_index()
13681367
tm.assert_series_equal(result, expected)
13691368

13701369
# check with ndarray construction ndim>0
@@ -1373,7 +1372,7 @@ def test_constructor_with_datetimes(self):
13731372
intname: np.array([1] * 10, dtype=intname)},
13741373
index=np.arange(10))
13751374
result = df.get_dtype_counts()
1376-
result.sort_index()
1375+
result = result.sort_index()
13771376
tm.assert_series_equal(result, expected)
13781377

13791378
# GH 2809
@@ -1384,8 +1383,8 @@ def test_constructor_with_datetimes(self):
13841383
df = DataFrame({'datetime_s': datetime_s})
13851384
result = df.get_dtype_counts()
13861385
expected = Series({datetime64name: 1})
1387-
result.sort_index()
1388-
expected.sort_index()
1386+
result = result.sort_index()
1387+
expected = expected.sort_index()
13891388
tm.assert_series_equal(result, expected)
13901389

13911390
# GH 2810
@@ -1395,8 +1394,8 @@ def test_constructor_with_datetimes(self):
13951394
df = DataFrame({'datetimes': datetimes, 'dates': dates})
13961395
result = df.get_dtype_counts()
13971396
expected = Series({datetime64name: 1, objectname: 1})
1398-
result.sort_index()
1399-
expected.sort_index()
1397+
result = result.sort_index()
1398+
expected = expected.sort_index()
14001399
tm.assert_series_equal(result, expected)
14011400

14021401
# GH 7594
@@ -1519,8 +1518,8 @@ def test_constructor_for_list_with_dtypes(self):
15191518
result = df.get_dtype_counts()
15201519
expected = Series(
15211520
{'int64': 1, 'float64': 2, datetime64name: 1, objectname: 1})
1522-
result.sort_index()
1523-
expected.sort_index()
1521+
result = result.sort_index()
1522+
expected = expected.sort_index()
15241523
tm.assert_series_equal(result, expected)
15251524

15261525
def test_constructor_frame_copy(self):
@@ -1832,7 +1831,7 @@ def test_from_records_misc_brokenness(self):
18321831
rows.append([datetime(2010, 1, 1), 1])
18331832
rows.append([datetime(2010, 1, 2), 1])
18341833
df2_obj = DataFrame.from_records(rows, columns=['date', 'test'])
1835-
results = df2_obj.get_dtype_counts()
1834+
results = df2_obj.get_dtype_counts().sort_index()
18361835
expected = Series({'datetime64[ns]': 1, 'int64': 1})
18371836
tm.assert_series_equal(results, expected)
18381837

‎pandas/tests/frame/test_dtypes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,9 @@ def test_timedeltas(self):
725725
df = DataFrame(dict(A=Series(date_range('2012-1-1', periods=3,
726726
freq='D')),
727727
B=Series([timedelta(days=i) for i in range(3)])))
728-
result = df.get_dtype_counts().sort_values()
728+
result = df.get_dtype_counts().sort_index()
729729
expected = Series(
730-
{'datetime64[ns]': 1, 'timedelta64[ns]': 1}).sort_values()
730+
{'datetime64[ns]': 1, 'timedelta64[ns]': 1}).sort_index()
731731
assert_series_equal(result, expected)
732732

733733
df['C'] = df['A'] + df['B']

‎pandas/tests/frame/test_indexing.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2430,8 +2430,8 @@ def _check_get(df, cond, check_dtypes=True):
24302430

24312431
# upcasting case (GH # 2794)
24322432
df = DataFrame(dict((c, Series([1] * 3, dtype=c))
2433-
for c in ['int64', 'int32',
2434-
'float32', 'float64']))
2433+
for c in ['float32', 'float64',
2434+
'int32', 'int64']))
24352435
df.iloc[1, :] = 0
24362436
result = df.where(df >= 0).get_dtype_counts()
24372437

‎pandas/tests/frame/test_mutate_columns.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,17 @@ def test_insert(self):
166166

167167
# new item
168168
df['x'] = df['a'].astype('float32')
169-
result = Series(dict(float64=5, float32=1))
170-
assert (df.get_dtype_counts() == result).all()
169+
result = Series(dict(float32=1, float64=5))
170+
assert (df.get_dtype_counts().sort_index() == result).all()
171171

172172
# replacing current (in different block)
173173
df['a'] = df['a'].astype('float32')
174-
result = Series(dict(float64=4, float32=2))
175-
assert (df.get_dtype_counts() == result).all()
174+
result = Series(dict(float32=2, float64=4))
175+
assert (df.get_dtype_counts().sort_index() == result).all()
176176

177177
df['y'] = df['a'].astype('int32')
178-
result = Series(dict(float64=4, float32=2, int32=1))
179-
assert (df.get_dtype_counts() == result).all()
178+
result = Series(dict(float32=2, float64=4, int32=1))
179+
assert (df.get_dtype_counts().sort_index() == result).all()
180180

181181
with tm.assert_raises_regex(ValueError, 'already exists'):
182182
df.insert(1, 'a', df['b'])

‎pandas/tests/frame/test_nonunique_indexes.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ def check(result, expected=None):
155155

156156
# rename, GH 4403
157157
df4 = DataFrame(
158-
{'TClose': [22.02],
159-
'RT': [0.0454],
158+
{'RT': [0.0454],
159+
'TClose': [22.02],
160160
'TExg': [0.0422]},
161161
index=MultiIndex.from_tuples([(600809, 20130331)],
162162
names=['STK_ID', 'RPT_Date']))
163163

164-
df5 = DataFrame({'STK_ID': [600809] * 3,
165-
'RPT_Date': [20120930, 20121231, 20130331],
164+
df5 = DataFrame({'RPT_Date': [20120930, 20121231, 20130331],
165+
'STK_ID': [600809] * 3,
166166
'STK_Name': [u('饡驦'), u('饡驦'), u('饡驦')],
167167
'TClose': [38.05, 41.66, 30.01]},
168168
index=MultiIndex.from_tuples(

‎pandas/tests/frame/test_reshape.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -719,9 +719,10 @@ def verify(df):
719719
assert_frame_equal(left, right)
720720

721721
# GH7401
722-
df = pd.DataFrame({'A': list('aaaaabbbbb'), 'C': np.arange(10),
722+
df = pd.DataFrame({'A': list('aaaaabbbbb'),
723723
'B': (date_range('2012-01-01', periods=5)
724-
.tolist() * 2)})
724+
.tolist() * 2),
725+
'C': np.arange(10)})
725726

726727
df.iloc[3, 1] = np.NaN
727728
left = df.set_index(['A', 'B']).unstack()

‎pandas/tests/frame/test_to_csv.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1054,10 +1054,10 @@ def test_to_csv_with_dst_transitions(self):
10541054

10551055
def test_to_csv_quoting(self):
10561056
df = DataFrame({
1057-
'c_string': ['a', 'b,c'],
1058-
'c_int': [42, np.nan],
1059-
'c_float': [1.0, 3.2],
10601057
'c_bool': [True, False],
1058+
'c_float': [1.0, 3.2],
1059+
'c_int': [42, np.nan],
1060+
'c_string': ['a', 'b,c'],
10611061
})
10621062

10631063
expected = """\

0 commit comments

Comments
 (0)