Additional updates for lsst.daf.butler subpackage restructuring.

lsst · Oct 9, 2023 · ffc814c · ffc814c
1 parent 3eca894
commit ffc814c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/python/lsst/pipe/base/executionButlerBuilder.py b/python/lsst/pipe/base/executionButlerBuilder.py
@@ -34,7 +34,7 @@
 
 from lsst.daf.butler import Butler, Config, DatasetRef, DatasetType, Registry
 from lsst.daf.butler.registry import ConflictingDefinitionError, MissingDatasetTypeError
-from lsst.daf.butler.repoRelocation import BUTLER_ROOT_TAG
+from lsst.daf.butler.repo_relocation import BUTLER_ROOT_TAG
 from lsst.daf.butler.transfers import RepoExportContext
 from lsst.resources import ResourcePath, ResourcePathExpression
 from lsst.utils.introspection import get_class_of

diff --git a/python/lsst/pipe/base/graph/_loadHelpers.py b/python/lsst/pipe/base/graph/_loadHelpers.py
@@ -37,7 +37,8 @@
 from typing import TYPE_CHECKING, BinaryIO
 from uuid import UUID
 
-from lsst.daf.butler import DimensionUniverse, PersistenceContextVars
+from lsst.daf.butler import DimensionUniverse
+from lsst.daf.butler.persistence_context import PersistenceContextVars
 from lsst.resources import ResourceHandleProtocol, ResourcePath
 
 if TYPE_CHECKING:

diff --git a/python/lsst/pipe/base/graph/graph.py b/python/lsst/pipe/base/graph/graph.py
@@ -48,9 +48,9 @@
     DatasetType,
     DimensionRecordsAccumulator,
     DimensionUniverse,
-    PersistenceContextVars,
     Quantum,
 )
+from lsst.daf.butler.persistence_context import PersistenceContextVars
 from lsst.resources import ResourcePath, ResourcePathExpression
 from lsst.utils.introspection import get_full_type_name
 from networkx.drawing.nx_agraph import write_dot