fix datajoint#1057

Author: dimitri-yatsenko

datajoint/dependencies.py

@@ -5,30 +5,6 @@
 from .errors import DataJointError
 
 
-def unite_master_parts(lst):
-    """
-    re-order a list of table names so that part tables immediately follow their master tables without breaking
-    the topological order.
-    Without this correction, a simple topological sort may insert other descendants between master and parts.
-    The input list must be topologically sorted.
-    :example:
-    unite_master_parts(
-        ['`s`.`a`', '`s`.`a__q`', '`s`.`b`', '`s`.`c`', '`s`.`c__q`', '`s`.`b__q`', '`s`.`d`', '`s`.`a__r`']) ->
-        ['`s`.`a`', '`s`.`a__q`', '`s`.`a__r`', '`s`.`b`', '`s`.`b__q`', '`s`.`c`', '`s`.`c__q`', '`s`.`d`']
-    """
-    for i in range(2, len(lst)):
-        name = lst[i]
-        match = re.match(r"(?P<master>`\w+`.`#?\w+)__\w+`", name)
-        if match:  # name is a part table
-            master = match.group("master")
-            for j in range(i - 1, -1, -1):
-                if lst[j] == master + "`" or lst[j].startswith(master + "__"):
-                    # move from the ith position to the (j+1)th position
-                    lst[j + 1 : i + 1] = [name] + lst[j + 1 : i]
-                    break
-    return lst
-
-
 class Dependencies(nx.DiGraph):
     """
     The graph of dependencies (foreign keys) between loaded tables.
@@ -168,9 +144,7 @@ def descendants(self, full_table_name):
         """
         self.load(force=False)
         nodes = self.subgraph(nx.algorithms.dag.descendants(self, full_table_name))
-        return unite_master_parts(
-            [full_table_name] + list(nx.algorithms.dag.topological_sort(nodes))
-        )
+        return [full_table_name] + list(nx.algorithms.dag.topological_sort(nodes))
 
     def ancestors(self, full_table_name):
         """
@@ -181,8 +155,6 @@ def ancestors(self, full_table_name):
         nodes = self.subgraph(nx.algorithms.dag.ancestors(self, full_table_name))
         return list(
             reversed(
-                unite_master_parts(
-                    list(nx.algorithms.dag.topological_sort(nodes)) + [full_table_name]
-                )
+                list(nx.algorithms.dag.topological_sort(nodes)) + [full_table_name]
             )
         )

datajoint/diagram.py

@@ -5,7 +5,6 @@
 import logging
 import inspect
 from .table import Table
-from .dependencies import unite_master_parts
 from .user_tables import Manual, Imported, Computed, Lookup, Part
 from .errors import DataJointError
 from .table import lookup_class_name
@@ -59,8 +58,7 @@ class Diagram:
         Entity relationship diagram, currently disabled due to the lack of required packages: matplotlib and pygraphviz.
 
         To enable Diagram feature, please install both matplotlib and pygraphviz. For instructions on how to install
-        these two packages, refer to http://docs.datajoint.io/setup/Install-and-connect.html#python and
-        http://tutorials.datajoint.io/setting-up/datajoint-python.html
+        these two packages, refer to https://datajoint.com/docs/core/datajoint-python/0.14/client/install/
         """
 
         def __init__(self, *args, **kwargs):
@@ -181,11 +179,9 @@ def is_part(part, master):
 
         def topological_sort(self):
             """:return:  list of nodes in topological order"""
-            return unite_master_parts(
-                list(
-                    nx.algorithms.dag.topological_sort(
-                        nx.DiGraph(self).subgraph(self.nodes_to_show)
-                    )
+            return list(
+                nx.algorithms.dag.topological_sort(
+                    nx.DiGraph(self).subgraph(self.nodes_to_show)
                 )
             )
 

tests/test_dependencies.py

@@ -1,51 +1,5 @@
 from datajoint import errors
 from pytest import raises
-from datajoint.dependencies import unite_master_parts
-
-
-def test_unite_master_parts():
-    assert unite_master_parts(
-        [
-            "`s`.`a`",
-            "`s`.`a__q`",
-            "`s`.`b`",
-            "`s`.`c`",
-            "`s`.`c__q`",
-            "`s`.`b__q`",
-            "`s`.`d`",
-            "`s`.`a__r`",
-        ]
-    ) == [
-        "`s`.`a`",
-        "`s`.`a__q`",
-        "`s`.`a__r`",
-        "`s`.`b`",
-        "`s`.`b__q`",
-        "`s`.`c`",
-        "`s`.`c__q`",
-        "`s`.`d`",
-    ]
-    assert unite_master_parts(
-        [
-            "`lab`.`#equipment`",
-            "`cells`.`cell_analysis_method`",
-            "`cells`.`cell_analysis_method_task_type`",
-            "`cells`.`cell_analysis_method_users`",
-            "`cells`.`favorite_selection`",
-            "`cells`.`cell_analysis_method__cell_selection_params`",
-            "`lab`.`#equipment__config`",
-            "`cells`.`cell_analysis_method__field_detect_params`",
-        ]
-    ) == [
-        "`lab`.`#equipment`",
-        "`lab`.`#equipment__config`",
-        "`cells`.`cell_analysis_method`",
-        "`cells`.`cell_analysis_method__cell_selection_params`",
-        "`cells`.`cell_analysis_method__field_detect_params`",
-        "`cells`.`cell_analysis_method_task_type`",
-        "`cells`.`cell_analysis_method_users`",
-        "`cells`.`favorite_selection`",
-    ]
 
 
 def test_nullable_dependency(thing_tables):