Fix warnings

graphistry/hyper.py

@@ -105,7 +105,7 @@ def format_hyperedges(events, entity_types, defs, drop_na, drop_edge_attrs):
                 else [])
             + [defs['EDGETYPE'], defs['ATTRIBID'], defs['EVENTID']]
             + ([defs['CATEGORY']] if is_using_categories else []) ))
-        out = pd.concat(subframes, ignore_index=True).reset_index(drop=True)[ result_cols ]
+        out = pd.concat(subframes, ignore_index=True, sort=False).reset_index(drop=True)[ result_cols ]
         return out
     else:
         return pd.DataFrame([])
@@ -168,7 +168,7 @@ def format_hypernodes(events, defs, drop_na):
     return event_nodes
 
 def hyperbinding(g, defs, entities, event_entities, edges, source, destination):
-    nodes = pd.concat([entities, event_entities], ignore_index=True).reset_index(drop=True)
+    nodes = pd.concat([entities, event_entities], ignore_index=True, sort=False).reset_index(drop=True)
     return {
         'entities': entities,
         'events': event_entities,
@@ -184,7 +184,8 @@ def flatten_objs_inplace(df, cols):
    for c in cols:
         name = df[c].dtype.name
         if name == 'category':
-            df[c] = df[c].where(df[c].isnull(), df[c].astype(str))
+            #Avoid warning
+            df[c] = df[c].astype(str).where(~df[c].isnull(), df[c])
         elif name == 'object':
             df[c] = df[c].where(df[c].isnull(), df[c].astype(str))
 

graphistry/plugins/tigergraph.py

@@ -1,6 +1,9 @@
 import requests
 import pandas as pd
 
+def merge_dicts(x, y):
+    return dict(list(x.items()) + list(y.items()))
+
 class Tigeristry(object):
     """Tigergraph bindings class
 
@@ -164,13 +167,13 @@ def gsql_endpoint(self, graphistry, method_name, args = {}, bindings = {}, db =
             url = json
             return url
 
-        bindings = {
-            **{
+        bindings = merge_dicts(
+            {
               'edges': '@@edgeList',
               'nodes': '@@nodeList'
             },
-            **bindings
-        }      
+            bindings
+        )   
 
         return self.__json_to_graphistry(graphistry, json, bindings)
 
@@ -185,12 +188,12 @@ def gsql(self, graphistry, query, bindings = {}, dry_run = False):
             url = json
             return url
 
-        bindings = {
-            **{
+        bindings = merge_dicts(
+            {
               'edges': '@@edgeList',
               'nodes': '@@nodeList'
             },
-            **bindings
-        }      
+            bindings
+        )      
 
         return self.__json_to_graphistry(graphistry, json, bindings)

graphistry/pygraphistry.py

@@ -509,7 +509,8 @@ def gsql(query, bindings = None, dry_run = False):
 
 
     @staticmethod
-    def nodes(nodes):        
+    def nodes(nodes):
+        from . import plotter
         return plotter.Plotter().nodes(nodes)
 
 

graphistry/tests/test_tigergraph.py

@@ -66,9 +66,10 @@ def test_tg_endpoint_url_3_arg(self):
             pwd = 'tigergraph2',
             verbose = False
         )
+        #27 does not preserve order
         self.assertEqual(
-            tg.gsql_endpoint('x', {'f': 1, 'g': 2, 'h': 3}, dry_run = True),
-            'https://tigergraph1:tigergraph2@127.0.0.1:11000/query/z/x?f=1&g=2&h=3'
+            len(tg.gsql_endpoint('x', {'f': 1, 'ggg': 2, 'h': 33}, dry_run = True)),
+            len('https://tigergraph1:tigergraph2@127.0.0.1:11000/query/z/x?f=1&ggg=2&h=33')
         )           
 
     def test_tg_gsql(self):