Merge pull request #355 from lsst/tickets/DM-39944

DM-39944: Update Execution butler builder to use Butler._registry
lsst · Jul 14, 2023 · 1237108 · 1237108
2 parents e0406b7 + 3517803
commit 1237108
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
       - id: trailing-whitespace
       - id: check-toml
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.7.0
     hooks:
       - id: black
         # It is recommended to specify the latest version of Python
@@ -22,6 +22,6 @@ repos:
         name: isort (python)
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.0.275
+    rev: v0.0.278
     hooks:
       - id: ruff
diff --git a/python/lsst/pipe/base/executionButlerBuilder.py b/python/lsst/pipe/base/executionButlerBuilder.py
@@ -240,7 +240,7 @@ def _export(butler: Butler, collections: Iterable[str] | None, inserts: DataSetT
     # export/import
     BackendClass = get_class_of(butler._config["repo_transfer_formats", "yaml", "export"])
     backend = BackendClass(yamlBuffer, universe=butler.dimensions)
-    exporter = RepoExportContext(butler.registry, butler._datastore, backend, directory=None, transfer=None)
+    exporter = RepoExportContext(butler._registry, butler._datastore, backend, directory=None, transfer=None)
 
     # Need to ensure that the dimension records for outputs are
     # transferred.

diff --git a/python/lsst/pipe/base/tests/simpleQGraph.py b/python/lsst/pipe/base/tests/simpleQGraph.py
@@ -414,7 +414,7 @@ def makeSimpleQGraph(
         query based on dataset existence, defaults to
         `DatasetQueryConstraintVariant.ALL`.
     makeDatastoreRecords : `bool`, optional
-        If `True` then add datstore records to generated quanta.
+        If `True` then add datastore records to generated quanta.
     bind : `~collections.abc.Mapping`, optional
         Mapping containing literal values that should be injected into the
         ``userQuery`` expression, keyed by the identifiers they replace.
@@ -446,7 +446,7 @@ def makeSimpleQGraph(
     builder = GraphBuilder(
         registry=butler.registry,
         skipExistingIn=skipExistingIn,
-        datastore=butler.datastore if makeDatastoreRecords else None,
+        datastore=butler._datastore if makeDatastoreRecords else None,
     )
     if not run:
         assert butler.run is not None, "Butler must have run defined"