aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuren Baghdasaryan <surenb@google.com>2017-07-25 14:34:43 -0700
committerSuren Baghdasaryan <surenb@google.com>2017-07-25 14:34:43 -0700
commit09d7b9aa2cd1bbc237d15648eb72a8ee93e06d93 (patch)
tree21e89121a728fe2f3ef61bd5202fcfe62b1c1d3d
parenteffd7b5ba93f752abe87c0def558d64e9b88b2ef (diff)
downloadtrappy-09d7b9aa2cd1bbc237d15648eb72a8ee93e06d93.tar.gz
trappy/utils: Replace deprecated DataFrame.sort with DataFrame.sort_values
Change-Id: I583e7c899074be772394a977e9e6526277dd7647 Signed-off-by: Suren Baghdasaryan <surenb@google.com>
-rw-r--r--trappy/utils.py2
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)