Updated to pd.concat sort=True

michaelkyu · Dec 8, 2018 · de4e141 · de4e141
1 parent 6839d74
commit de4e141
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/ddot/Ontology.py b/ddot/Ontology.py
@@ -1642,7 +1642,11 @@ def from_table(cls,
             mapping_attr = mapping.set_index([mapping_child, mapping_parent])
             mapping_attr.index.rename(['Child', 'Parent'], inplace=True)
 
-            edge_attr = pd.concat([edge_attr, mapping_attr])
+            try:
+                # Used for pandas version >= 0.23
+                edge_attr = pd.concat([edge_attr, mapping_attr], sort=True)
+            except:
+                edge_attr = pd.concat([edge_attr, mapping_attr])
             mapping = mapping.loc[:,[mapping_child, mapping_parent]]
             hierarchy = table.loc[:,[child, parent]]
 
@@ -2104,7 +2108,11 @@ def focus(self,
             new_nodes = new_connections['Child'].values.tolist()
             new_connections['Summary'] = True
             df['Summary'] = False
-            tmp = pd.concat([df, new_connections], ignore_index=True)
+            try:
+                # Used for pandas version >= 0.23
+                tmp = pd.concat([df, new_connections], ignore_index=True, sort=True)
+            except:
+                tmp = pd.concat([df, new_connections], ignore_index=True)
             df = tmp[df.columns]
 
         ont = Ontology.from_table(df)