Update

lsst · Mar 3, 2023 · edf2cf3 · edf2cf3
1 parent 2a42e2c
commit edf2cf3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/python/lsst/daf/butler/cli/cmd/commands.py b/python/lsst/daf/butler/cli/cmd/commands.py
@@ -454,8 +454,6 @@ def query_dataset_types(*args: Any, **kwargs: Any) -> None:
 @click.argument("dataset-type-name", nargs=-1)
 def remove_dataset_type(*args: Any, **kwargs: Any) -> None:
     """Remove the dataset type definitions from a repository."""
-    print(args)
-    print(kwargs)
     script.removeDatasetType(*args, **kwargs)
 
 

diff --git a/python/lsst/daf/butler/registries/sql.py b/python/lsst/daf/butler/registries/sql.py
@@ -425,7 +425,7 @@ def removeDatasetType(self, name: str | tuple([str, ...])) -> None:
             else:
                 for datasetType in datasetTypes:
                     self._managers.datasets.remove(datasetType.name)
-                    _LOG.info("Removed %r", datasetType.name)
+                    _LOG.info("Removed dataset type %r", datasetType.name)
 
     def getDatasetType(self, name: str) -> DatasetType:
         # Docstring inherited from lsst.daf.butler.registry.Registry

diff --git a/python/lsst/daf/butler/registry/_registry.py b/python/lsst/daf/butler/registry/_registry.py
@@ -609,7 +609,7 @@ def removeDatasetType(self, name: str | tuple([str, ...])) -> None:
         ----------
         name : `str` or `tuple([str, ...])`
             Name of the type to be removed or tuple containing a list of type
-            names to be removed.
+            names to be removed. Wildcards are allowed.
 
         Raises
         ------

diff --git a/tests/test_cliCmdQueryDatasetTypes.py b/tests/test_cliCmdQueryDatasetTypes.py
@@ -184,7 +184,7 @@ def testRemoveDatasetTypes(self):
                     ],
                 )
 
-            # checks wildcard / literal combination
+            # Check wildcard / literal combination.
             result = runner.invoke(cli, ["remove-dataset-type", "here", "*other", "testA"])
             self.assertEqual(result.exit_code, 0, clickResultMsg(result))
             self.assertDatasetTypes(
@@ -201,7 +201,7 @@ def testRemoveDatasetTypes(self):
                 ),
             )
 
-            # checks literal / literal combination
+            # Check literal / literal combination.
             result = runner.invoke(cli, ["remove-dataset-type", "here", "option", "testB"])
             self.assertEqual(result.exit_code, 0, clickResultMsg(result))
             self.assertDatasetTypes(
@@ -216,7 +216,7 @@ def testRemoveDatasetTypes(self):
                 ),
             )
 
-            # checks wildcard
+            # Check wildcard.
             result = runner.invoke(cli, ["remove-dataset-type", "here", "test*"])
             self.assertEqual(result.exit_code, 0, clickResultMsg(result))
             self.assertDatasetTypes(
@@ -228,7 +228,7 @@ def testRemoveDatasetTypes(self):
                 ),
             )
 
-            # checks literal
+            # Check literal.
             result = runner.invoke(cli, ["remove-dataset-type", "here", "option2"])
             self.assertEqual(result.exit_code, 0, clickResultMsg(result))
             self.assertDatasetTypes(runner, "*", ("placeholder",))