fix #675

Author: dimitri-yatsenko

datajoint/diagram.py

@@ -236,8 +236,8 @@ def _make_graph(self):
             for name in self.nodes_to_show:
                 foreign_attributes = set(
                     attr for p in self.in_edges(name, data=True) for attr in p[2]['attr_map'] if p[2]['primary'])
-                self.node[name]['distinguished'] = (
-                        'primary_key' in self.node[name] and foreign_attributes < self.node[name]['primary_key'])
+                self.nodes[name]['distinguished'] = (
+                        'primary_key' in self.nodes[name] and foreign_attributes < self.nodes[name]['primary_key'])
             # include aliased nodes that are sandwiched between two displayed nodes
             gaps = set(nx.algorithms.boundary.node_boundary(self, self.nodes_to_show)).intersection(
                 nx.algorithms.boundary.node_boundary(nx.DiGraph(self).reverse(), self.nodes_to_show))
@@ -307,7 +307,7 @@ def make_dot(self):
                 props = graph.get_edge_data(src, dest)
                 edge.set_color('#00000040')
                 edge.set_style('solid' if props['primary'] else 'dashed')
-                master_part = graph.node[dest]['node_type'] is Part and dest.startswith(src+'.')
+                master_part = graph.nodes[dest]['node_type'] is Part and dest.startswith(src+'.')
                 edge.set_weight(3 if master_part else 1)
                 edge.set_arrowhead('none')
                 edge.set_penwidth(.75 if props['multi'] else 2)

requirements.txt

@@ -4,7 +4,7 @@ pyparsing
 ipython
 pandas
 tqdm
-networkx<2.4
+networkx
 pydot
 minio
 matplotlib

tests/test_jobs.py

@@ -10,11 +10,11 @@
 
 
 def test_reserve_job():
-    # clean jobs table
-    schema.schema.jobs.delete()
 
+    schema.schema.jobs.delete()
     assert_true(subjects)
     table_name = 'fake_table'
+
     # reserve jobs
     for key in subjects.fetch('KEY'):
         assert_true(schema.schema.jobs.reserve(table_name, key), 'failed to reserve a job')