commit 09d7b9aa2cd1bbc237d15648eb72a8ee93e06d93
author Suren Baghdasaryan <surenb@google.com> Tue Jul 25 14:34:43 2017 -0700
committer Suren Baghdasaryan <surenb@google.com> Tue Jul 25 14:34:43 2017 -0700
tree 21e89121a728fe2f3ef61bd5202fcfe62b1c1d3d
parent effd7b5ba93f752abe87c0def558d64e9b88b2ef

trappy/utils: Replace deprecated DataFrame.sort with DataFrame.sort_values

Change-Id: I583e7c899074be772394a977e9e6526277dd7647
Signed-off-by: Suren Baghdasaryan <surenb@google.com>

trappy/utils.py

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 @@
         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)