diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-06 08:15:13 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-06 08:15:13 +0000 |
| commit | a1c892a53503128e8a0da4befeead5217dbdd8d3 (patch) | |
| tree | 21e89121a728fe2f3ef61bd5202fcfe62b1c1d3d | |
| parent | effd7b5ba93f752abe87c0def558d64e9b88b2ef (diff) | |
| parent | 6d69188540ca7d2963dad44e49577075a3d2c8e4 (diff) | |
| download | trappy-a1c892a53503128e8a0da4befeead5217dbdd8d3.tar.gz | |
release-request-64fc473b-7e45-48f5-b2f7-3c916e338608-for-git_pi-release-4249735 snap-temp-L34700000089732387
Change-Id: I96f31a8c587279bce54e64de7233620458fe0645
| -rw-r--r-- | trappy/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/trappy/utils.py b/trappy/utils.py index 47ef4ab..a06ff1d 100644 --- a/trappy/utils.py +++ b/trappy/utils.py @@ -155,7 +155,7 @@ def merge_dfs(pr_df, sec_df, pivot): data['Time'] = data['Time'][1] merged_data.append(data) - df = pd.concat([pr_df, sec_df], keys=['primary', 'secondary']).sort(columns='__line') + df = pd.concat([pr_df, sec_df], keys=['primary', 'secondary']).sort_values(by='__line') apply_callback(df, df_fn) merged_df = pd.DataFrame.from_dict(merged_data) merged_df.set_index('Time', inplace=True) |