Merge pull request #985 from ttngu207/master

bugfix in `unite_master_parts` - handles dj.Lookup tables

Author: dimitri-yatsenko

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Release notes
 
 ### 0.13.3 -- TBD
+* Bugfix - Fix error in listing ancestors, descendants with part tables.
 * Bugfix - Fix Python 3.10 compatibility (#983) PR #972
 * Bugfix - Allow renaming non-conforming attributes in proj (#982) PR #972
 * Add - Expose proxy feature for S3 external stores (#961) PR #962

datajoint/dependencies.py

@@ -18,7 +18,7 @@ def unite_master_parts(lst):
     """
     for i in range(2, len(lst)):
         name = lst[i]
-        match = re.match(r'(?P<master>`\w+`.`\w+)__\w+`', name)
+        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):

docs-parts/intro/Releases_lang1.rst

@@ -1,5 +1,6 @@
 0.13.3 -- TBD
 ----------------------
+* Bugfix - Fix error in listing ancestors, descendants with part tables.
 * Bugfix - Fix Python 3.10 compatibility (#983) PR #972
 * Bugfix - Allow renaming non-conforming attributes in proj (#982) PR #972
 * Add - Expose proxy feature for S3 external stores (#961) PR #962

tests/test_dependencies.py

@@ -9,13 +9,17 @@ def test_unite_master_parts():
         ['`s`.`a`', '`s`.`a__q`', '`s`.`a__r`', '`s`.`b`', '`s`.`b__q`', '`s`.`c`', '`s`.`c__q`', '`s`.`d`'])
     assert_list_equal(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`',