List chained collection children in search order.

The TABLE mode of butler query-collections, unlike the default TREE, listed child collections in alphabetical order. This has now been changed to match TREE's behavior. No changes were needed for FLATTEN, which ignores chains anyway.
lsst · Jan 24, 2024 · 1007d69 · 1007d69
1 parent 92313a9
commit 1007d69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/doc/changes/DM-42605.bugfix.rst b/doc/changes/DM-42605.bugfix.rst
@@ -0,0 +1 @@
+butler query-collections --chains=TABLE now lists children in search order, not alphabetical order.
diff --git a/python/lsst/daf/butler/script/queryCollections.py b/python/lsst/daf/butler/script/queryCollections.py
@@ -96,7 +96,7 @@ def _getTable(
                 children = butler.registry.getCollectionChain(name)
                 if children:
                     first = True
-                    for child in sorted(children):
+                    for child in children:
                         table.add_row((name if first else "", type.name if first else "", child))
                         first = False
                 else:

diff --git a/tests/test_cliCmdQueryCollections.py b/tests/test_cliCmdQueryCollections.py
@@ -225,9 +225,9 @@ def testChained(self):
                 array(
                     (
                         ("calibration1", "CALIBRATION", ""),
-                        ("chain1", "CHAINED", "chain2"),
+                        ("chain1", "CHAINED", "tag1"),
                         ("", "", "run1"),
-                        ("", "", "tag1"),
+                        ("", "", "chain2"),
                         ("chain2", "CHAINED", "calibration1"),
                         ("", "", "run1"),
                         ("imported_g", "RUN", ""),