diff options
| author | Joel Fernandes <joelaf@google.com> | 2017-07-15 00:59:27 -0700 |
|---|---|---|
| committer | Joel Fernandes <joelaf@google.com> | 2017-08-04 10:11:53 -0700 |
| commit | 6d69188540ca7d2963dad44e49577075a3d2c8e4 (patch) | |
| tree | 21e89121a728fe2f3ef61bd5202fcfe62b1c1d3d | |
| parent | effd7b5ba93f752abe87c0def558d64e9b88b2ef (diff) | |
| download | trappy-6d69188540ca7d2963dad44e49577075a3d2c8e4.tar.gz | |
trappy/utils: use sort_values for merge_dfs
To prevent annoying warning.
Change-Id: I60f006a3c806864939019a90d12b236487fb51aa
Signed-off-by: Joel Fernandes <joelaf@google.com>
| -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) |