Merge pull request #705 from dimitri-yatsenko/master

Fix #675

Author: eywalker

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,44 +10,42 @@
 
 
 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')
+        assert_true(schema.schema.jobs.reserve(table_name, key), 'failed to reserve a job')
+
     # refuse jobs
     for key in subjects.fetch('KEY'):
-        assert_false(schema.schema.jobs.reserve(table_name, key),
-                     'failed to respect reservation')
+        assert_false(schema.schema.jobs.reserve(table_name, key), 'failed to respect reservation')
+
     # complete jobs
     for key in subjects.fetch('KEY'):
         schema.schema.jobs.complete(table_name, key)
-    assert_false(schema.schema.jobs,
-                 'failed to free jobs')
+    assert_false(schema.schema.jobs, 'failed to free jobs')
+
     # reserve jobs again
     for key in subjects.fetch('KEY'):
-        assert_true(schema.schema.jobs.reserve(table_name, key),
-                    'failed to reserve new jobs')
+        assert_true(schema.schema.jobs.reserve(table_name, key), 'failed to reserve new jobs')
+
     # finish with error
     for key in subjects.fetch('KEY'):
-        schema.schema.jobs.error(table_name, key,
-                                 "error message")
+        schema.schema.jobs.error(table_name, key, "error message")
+
     # refuse jobs with errors
     for key in subjects.fetch('KEY'):
-        assert_false(schema.schema.jobs.reserve(table_name, key),
-                     'failed to ignore error jobs')
+        assert_false(schema.schema.jobs.reserve(table_name, key), 'failed to ignore error jobs')
+
     # clear error jobs
     (schema.schema.jobs & dict(status="error")).delete()
-    assert_false(schema.schema.jobs,
-                 'failed to clear error jobs')
+    assert_false(schema.schema.jobs, 'failed to clear error jobs')
 
 
 def test_restrictions():
-    # clear out jobs table
     jobs = schema.schema.jobs
     jobs.delete()
     jobs.reserve('a', {'key': 'a1'})
@@ -56,10 +54,9 @@ def test_restrictions():
     jobs.error('a', {'key': 'a2'}, 'error')
     jobs.error('b', {'key': 'b1'}, 'error')
 
-    assert_true(len(jobs & 'table_name = "a"') == 2, 'There should be two entries for table a')
-    assert_true(len(jobs & 'status = "error"') == 2, 'There should be two entries with error status')
-    assert_true(len(jobs & 'table_name = "a"' & 'status = "error"') == 1,
-                'There should be only one entries with error status in table a')
+    assert_true(len(jobs & {'table_name': "a"}) == 2)
+    assert_true(len(jobs & {'status': "error"}) == 2)
+    assert_true(len(jobs & {'table_name': "a", 'status': "error"}) == 1)
     jobs.delete()
 
 
@@ -96,9 +93,7 @@ def test_suppress_dj_errors():
     schema.schema.jobs.delete()
     with dj.config(enable_python_native_blobs=False):
         schema.ErrorClass.populate(reserve_jobs=True, suppress_errors=True)
-    number_of_exceptions = len(schema.DjExceptionName())
-    assert_true(number_of_exceptions > 0)
-    assert_equals(number_of_exceptions, len(schema.schema.jobs))
+    assert_true(len(schema.DjExceptionName()) == len(schema.schema.jobs) > 0)
 
 
 def test_long_error_message():
@@ -111,7 +106,7 @@ def test_long_error_message():
     assert_true(subjects)
     table_name = 'fake_table'
 
-    key = list(subjects.fetch('KEY'))[0]
+    key = subjects.fetch('KEY')[0]
 
     # test long error message
     schema.schema.jobs.reserve(table_name, key)